diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
index 9797dc6e7b12..9e194b30253c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
@@ -192,6 +192,7 @@ public class EntryPointsManagerImpl implements PersistentStateComponent<Element>
   public void resolveEntryPoints(final RefManager manager) {
     if (!myResolved) {
       myResolved = true;
+      cleanup();
       validateEntryPoints();
 
       ApplicationManager.getApplication().runReadAction(new Runnable() {