diff --git a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
index e58f19b0ea87..aa7d6e13eba8 100644
--- a/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
+++ b/plugins/devkit/devkit-core/src/dom/ide/PluginDescriptorDomFileSearchScopeProvider.java
@@ -50,7 +50,9 @@ final class PluginDescriptorDomFileSearchScopeProvider implements SearchScopePro
       if (ApplicationManager.getApplication().isReadAccessAllowed()) {
         return getDomFileCandidates(project);
       }
-      return ReadAction.nonBlocking(() -> getDomFileCandidates(project)).executeSynchronously();
+      return ReadAction.nonBlocking(() -> getDomFileCandidates(project))
+        .expireWhen(() -> project.isDisposed())
+        .executeSynchronously();
     };
   }