diff --git a/platform/configuration-store-impl/src/StoreAwareProjectManager.kt b/platform/configuration-store-impl/src/StoreAwareProjectManager.kt index c3e35f53c9c1..d47cdc0ac2c4 100644 --- a/platform/configuration-store-impl/src/StoreAwareProjectManager.kt +++ b/platform/configuration-store-impl/src/StoreAwareProjectManager.kt @@ -67,6 +67,10 @@ class StoreAwareProjectManager(virtualFileManager: VirtualFileManager, progressM if (!changes.isEmpty()) { runBatchUpdate(project.getMessageBus()) { for ((store, storages) in changes.entrySet()) { + if ((store.storageManager as? StateStorageManagerImpl)?.componentManager?.isDisposed() ?: false) { + continue + } + @suppress("UNCHECKED_CAST") if (reloadStore(storages as Set, store, false) == ReloadComponentStoreStatus.RESTART_AGREED) { projectsToReload.add(project)