diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index 39383bfea09..4dd7d8d4c96 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -1320,6 +1320,8 @@ public class CModelManager implements IResourceChangeListener, IContentTypeChang
 	}
 
 	private void preCloseProject(IProject project) {
+		// remove binary parsers
+		binaryParsersMap.remove(project);
 		// stop the binary runner for this project
 		removeBinaryRunner(project);
 		// stop indexing jobs for this project