diff --git a/lib/syntax_tree/node.rb b/lib/syntax_tree/node.rb
index ac6092ca..a2c78677 100644
--- a/lib/syntax_tree/node.rb
+++ b/lib/syntax_tree/node.rb
@@ -7210,36 +7210,17 @@ def format(q)
         q.text(" ")
         q
           .if_break do
-            force_parens =
-              q.parents.any? do |node|
-                node.is_a?(Command) || node.is_a?(CommandCall)
-              end
-
-            if force_parens
-              q.text("{")
+            q.text("do")
 
-              unless statements.empty?
-                q.indent do
-                  q.breakable_space
-                  q.format(statements)
-                end
+            unless statements.empty?
+              q.indent do
                 q.breakable_space
+                q.format(statements)
               end
-
-              q.text("}")
-            else
-              q.text("do")
-
-              unless statements.empty?
-                q.indent do
-                  q.breakable_space
-                  q.format(statements)
-                end
-              end
-
-              q.breakable_space
-              q.text("end")
             end
+
+            q.breakable_space
+            q.text("end")
           end
           .if_flat do
             q.text("{")
diff --git a/test/fixtures/lambda.rb b/test/fixtures/lambda.rb
index 5dba3be3..8b922ef0 100644
--- a/test/fixtures/lambda.rb
+++ b/test/fixtures/lambda.rb
@@ -80,3 +80,31 @@
 -> do # comment1
   # comment2
 end
+% # multiline lambda in a command
+command "arg" do
+  -> {
+    multi
+    line
+  }
+end
+-
+command "arg" do
+  -> do
+    multi
+    line
+  end
+end
+% # multiline lambda in a command call
+command.call "arg" do
+  -> {
+    multi
+    line
+  }
+end
+-
+command.call "arg" do
+  -> do
+    multi
+    line
+  end
+end