diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 694e701848f5..f6d50ba7fc91 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -834,13 +834,17 @@ public class BuildManager implements ApplicationComponent{
     }
 
     public void addChanged(Collection<String> paths) {
-      myDeleted.removeAll(paths);
-      myChanged.addAll(paths);
+      if (!myNeedRescan) {
+        myDeleted.removeAll(paths);
+        myChanged.addAll(paths);
+      }
     }
 
     public void addDeleted(Collection<String> paths) {
-      myChanged.removeAll(paths);
-      myDeleted.addAll(paths);
+      if (!myNeedRescan) {
+        myChanged.removeAll(paths);
+        myDeleted.addAll(paths);
+      }
     }
 
     public CmdlineRemoteProto.Message.ControllerMessage.FSEvent createNextEvent() {