diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
index bc6a4de92c38..2ab50e46d3ce 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
@@ -7,10 +7,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.ClearableLazyValue;
-import com.intellij.openapi.util.Factory;
-import com.intellij.openapi.util.ModificationTracker;
-import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
@@ -56,6 +53,10 @@ public class JsonSchemaServiceImpl implements JsonSchemaService, ModificationTra
       }
     };
     JsonSchemaProviderFactory.EP_NAME.addExtensionPointListener(this::reset, myProject);
+    Disposer.register(myProject, () -> {
+      myState.reset();
+      myBuiltInSchemaIds.drop();
+    });
 
     myCatalogManager = new JsonSchemaCatalogManager(myProject);