diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java b/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
index 1895f3fdd1ce..86513faaa952 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/EditorMouseHoverPopupManager.java
@@ -221,7 +221,11 @@ public final class EditorMouseHoverPopupManager implements Disposable {
         .submit(AppExecutorUtil.getAppExecutorService());
 
       myCurrentProgress = promise;
-      promise.onProcessed(__ -> UIUtil.invokeLaterIfNeeded(() -> myCurrentProgress = null));
+      promise.onProcessed(__ -> UIUtil.invokeLaterIfNeeded(() -> {
+        if (myCurrentProgress == promise) {
+          myCurrentProgress = null;
+        }
+      }));
     }, context.getShowingDelay());
   }