diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
index 6bd00b7343f7..0a21c8e3d281 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
@@ -501,6 +501,12 @@ public class InspectionProfileImpl extends NewInspectionProfile {
         getProfileManager().fireProfileChanged(InspectionProfileImpl.this);
       }
     }, project);
+    if (project != null) {
+      Disposer.register(project, () -> {
+        myTools.keySet().forEach(HighlightDisplayKey::unregister);
+        myTools.clear();
+      });
+    }
 
     DFSTBuilder<String> builder = new DFSTBuilder<>(GraphGenerator.generate(new InboundSemiGraph<String>() {
       @NotNull