diff --git a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
index 0e242cac1ce6..d391e3d552ca 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
@@ -127,8 +127,9 @@ public class HighlightDisplayKey {
                                                    @NonNls @Nullable final String id) {
     HighlightDisplayKey key = find(name);
     if (key == null) {
-      key = register(name, displayName, id != null ? id : name);
-      assert key != null : name;
+      final String registrationId = id != null ? id : name;
+      key = new HighlightDisplayKey(name, registrationId);
+      ourKeyToDisplayNameMap.put(key, new Computable.PredefinedValueComputable<>(displayName));
     }
     return key;
   }