diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
index 2883e72bdf5a..6188e7fad4c4 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
@@ -258,6 +258,7 @@ public class CodeBlockBlock extends AbstractJavaBlock {
           || elementType == JavaTokenType.INTERFACE_KEYWORD
           || elementType == JavaTokenType.IDENTIFIER
           || elementType == JavaTokenType.ENUM_KEYWORD
+          || elementType == JavaTokenType.MODULE_KEYWORD
           || elementType == JavaElementType.MODULE_REFERENCE) {
         return Indent.getNoneIndent();
       }
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaModuleFormatterTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaModuleFormatterTest.kt
index d134f8d057fe..035013ac2c72 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaModuleFormatterTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaModuleFormatterTest.kt
@@ -44,4 +44,8 @@ class JavaModuleFormatterTest : AbstractJavaFormatterTest() {
   fun testProvidesWith() {
     doTextTest("module m { provides I with C1,C2,C3; }", "module m {\n    provides I with C1, C2, C3;\n}")
   }
+
+  fun testAnnotatedModule() {
+    doTextTest("@Deprecated\nmodule m { }", "@Deprecated\nmodule m {\n}")
+  }
 }
\ No newline at end of file