diff --git a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index ef99dd9ca491..3768872a5c30 100644
--- a/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -128,7 +128,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
     return component;
   }
 
-  protected void disposeComponents() {
+  protected synchronized void disposeComponents() {
     assert !myDisposeCompleted : "Already disposed!";
 
     final List<Object> components = myComponentsRegistry.getRegisteredImplementations();