diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
index e59e3f162b1..665edd9ffc7 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
@@ -179,10 +179,12 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
                     return;
                 }
 
-                if (!isMarkedWithRedeclaration && Errors.REDECLARATION_DIAGNOSTICS.contains(diagnostic.getFactory())) {
-                    isMarkedWithRedeclaration = true;
-                    Annotation annotation = holder.createErrorAnnotation(diagnostic.getTextRanges().get(0), "");
-                    setUpAnnotation(diagnostic, annotation, null);
+                if (Errors.REDECLARATION_DIAGNOSTICS.contains(diagnostic.getFactory())) {
+                    if (!isMarkedWithRedeclaration) {
+                        isMarkedWithRedeclaration = true;
+                        Annotation annotation = holder.createErrorAnnotation(diagnostic.getTextRanges().get(0), "");
+                        setUpAnnotation(diagnostic, annotation, null);
+                    }
                     return;
                 }