diff --git a/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index 9e153b7ff725..c9e55e75cded 100644
--- a/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -107,6 +107,7 @@ public class DeclarationParser {
       if (!expect(builder, JavaTokenType.COMMA)) {
         if (builder.getTokenType() != null && builder.getTokenType() != JavaTokenType.SEMICOLON) {
           error(builder, JavaErrorMessages.message("expected.comma.or.semicolon"));
+          return;
         }
       }
     }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
index 2617874e8d32..e72df739108f 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
@@ -61,7 +61,7 @@ public class DeclarationParserTest extends JavaParsingTestCase {
   public void testEnumBody3() { doParserTest("{ RED, GREEN, BLUE, }", false, true); }
   public void testEnumBody4() { doParserTest("{ RED(0), GREEN(1), BLUE(2); }", false, true); }
   public void testEnumBody5() { doParserTest("{ @ANNOTATION A(10) }", false, true); }
-  //public void testEnumBody6() { doParserTest("{ RED, GREEN, BLUE\n OurEnum() {} }", false, true); }
+  public void testEnumBody6() { doParserTest("{ RED, GREEN, BLUE\n OurEnum() {} }", false, true); }
   public void testEnumWithInitializedConstants() { doParserTest("{ A(10) { },\n B { void method() {} } }", false, true); }
   public void testEnumWithoutConstants() { doParserTest("{ private A }", false, true); }