diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightVisitor.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightVisitor.java
index 5d29686f7e04..474e8e4853ca 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightVisitor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightVisitor.java
@@ -125,6 +125,7 @@ public class DefaultHighlightVisitor implements HighlightVisitor, DumbAware {
     List<Annotator> annotators = cachedAnnotators.get(element.getLanguage());
     if (annotators.isEmpty()) return;
     final boolean dumb = myDumbService.isDumb();
+    annotationHolder.setSession(holder.getAnnotationSession());
 
     if (!JobUtil.invokeConcurrentlyUnderMyProgress(annotators, new Processor<Annotator>() {
       public boolean process(Annotator annotator) {
@@ -132,8 +133,6 @@ public class DefaultHighlightVisitor implements HighlightVisitor, DumbAware {
           return true;
         }
 
-        annotationHolder.setSession(holder.getAnnotationSession());
-
         annotator.annotate(element, annotationHolder);
         return true;
       }
@@ -145,6 +144,7 @@ public class DefaultHighlightVisitor implements HighlightVisitor, DumbAware {
           holder.add(HighlightInfo.fromAnnotation(annotation));
         }
         annotationHolder.clear();
+        annotationHolder.setSession(null);
       }
     }
   }