diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
index b2891b1c922..1c36f585840 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
@@ -339,7 +339,7 @@ object KotlinToJVMBytecodeCompiler {
             val firAnalyzerFacade = FirAnalyzerFacade(session, moduleConfiguration.languageVersionSettings, ktFiles)
 
             firAnalyzerFacade.runResolution()
-            val firDiagnostics = firAnalyzerFacade.runCheckers()
+            val firDiagnostics = firAnalyzerFacade.runCheckers().values.flatten()
             AnalyzerWithCompilerReport.reportDiagnostics(
                 SimpleDiagnostics(
                     firDiagnostics.map { it.toRegularDiagnostic() }
diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
index 1156b700ac0..0375bf49fae 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/analysis/FirAnalyzerFacade.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtFile
 class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: LanguageVersionSettings, val ktFiles: List<KtFile>) {
     private var firFiles: List<FirFile>? = null
     private var scopeSession: ScopeSession? = null
-    private var collectedDiagnostics: List<FirDiagnostic<*>>? = null
+    private var collectedDiagnostics: Map<FirFile, List<FirDiagnostic<*>>>? = null
 
     private fun buildRawFir() {
         if (firFiles != null) return
@@ -52,13 +52,13 @@ class FirAnalyzerFacade(val session: FirSession, val languageVersionSettings: La
     }
 
     @OptIn(ExperimentalStdlibApi::class)
-    fun runCheckers(): List<FirDiagnostic<*>> {
+    fun runCheckers(): Map<FirFile, List<FirDiagnostic<*>>> {
         if (scopeSession == null) runResolution()
         if (collectedDiagnostics != null) return collectedDiagnostics!!
         val collector = FirDiagnosticsCollector.create(session)
-        collectedDiagnostics = buildList {
+        collectedDiagnostics = buildMap {
             for (file in firFiles!!) {
-                addAll(collector.collectDiagnostics(file))
+                put(file, collector.collectDiagnostics(file))
             }
         }
         return collectedDiagnostics!!