diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/problems/pass/ProjectProblemFileSelectionListener.kt b/java/java-impl/src/com/intellij/codeInsight/daemon/problems/pass/ProjectProblemFileSelectionListener.kt
index e455ace569ad..6b3a1bf8b473 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/problems/pass/ProjectProblemFileSelectionListener.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/problems/pass/ProjectProblemFileSelectionListener.kt
@@ -192,9 +192,9 @@ private class ProjectProblemFileSelectionListenerStartupActivity : ProjectActivi
         val virtualFile = FileDocumentManager.getInstance().getFile(event.editor.document) ?: return
         ReadAction.nonBlocking<Any> {
           if (!virtualFile.isValid) return@nonBlocking null
-          val psiFile = PsiManager.getInstance(project).findFile(virtualFile) ?: return@nonBlocking null
-          if (psiFile.viewProvider.isPhysical) return@nonBlocking null // will already be removed by the vfs file listener
-          removeState(psiFile)
+          val viewProvider = PsiManager.getInstance(project).findViewProvider(virtualFile) ?: return@nonBlocking null
+          if (viewProvider.isPhysical) return@nonBlocking null // will already be removed by the vfs file listener
+          removeState(viewProvider.getPsi(viewProvider.baseLanguage))
         }.expireWith(parentDisposable).submit(AppExecutorUtil.getAppExecutorService())
       }
     }, parentDisposable)