diff --git a/runtime/queries/go/indents.scm b/runtime/queries/go/indents.scm
index f72ec9e827b0..e439a9055fca 100644
--- a/runtime/queries/go/indents.scm
+++ b/runtime/queries/go/indents.scm
@@ -20,8 +20,9 @@
 ] @indent
 
 [
-  "case"
-  "}"
   "]"
   ")"
 ] @outdent
+
+((_ "}" @outdent) @outer (#not-kind-eq? @outer "select_statement"))
+(communication_case) @extend