diff --git a/polyglot/piranha/src/cleanup_rules/go/rules.toml b/polyglot/piranha/src/cleanup_rules/go/rules.toml
index ac1c850ae7..0eab48fc30 100644
--- a/polyglot/piranha/src/cleanup_rules/go/rules.toml
+++ b/polyglot/piranha/src/cleanup_rules/go/rules.toml
@@ -342,11 +342,11 @@ query = """
 (
     (block
         (statement_list
-            (_)* @pre
-            (block
+            (((_) "\\n"?)* @pre)
+            ((block
                 (statement_list) @nested.statements
-            ) @nested.block
-            (_)* @post
+            ) @nested.block)
+            (((_) "\\n"?)* @post)
         ) @outer.stmt_list
     ) @outer.block
 )
@@ -364,9 +364,9 @@ query = """
 (
     (block
         (statement_list
-            ((statement)* @pre)
+            (((statement) "\\n"?)* @pre)
             ((return_statement) @r)
-            ((statement)+ @post)
+            (((statement) "\\n"?)+ @post)
         ) @stmt_list
     ) @b
 )