diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/VfsBasedProjectEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/VfsBasedProjectEnvironment.kt
index 06333b7feb3..651dcb240b0 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/VfsBasedProjectEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/VfsBasedProjectEnvironment.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler
 
 import com.intellij.openapi.extensions.ExtensionPoint
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
@@ -75,6 +76,9 @@ open class VfsBasedProjectEnvironment(
         // see comment and TODO in KotlinCoreEnvironment.registerKotlinLightClassSupport (KT-64296)
         @Suppress("DEPRECATION")
         PsiElementFinder.EP.getPoint(project).registerExtension(firJavaElementFinder)
+        Disposer.register(project) {
+            psiFinderExtensionPoint.unregisterFinders<FirJavaElementFinder>()
+        }
     }
 
     private fun List<VirtualFile>.toSearchScope(allowOutOfProjectRoots: Boolean) =