diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirResolveSessionDepended.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirResolveSessionDepended.kt
index 96f349ce895..978a460e701 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirResolveSessionDepended.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/LLFirResolveSessionDepended.kt
@@ -49,11 +49,9 @@ internal class LLFirResolveSessionDepended(
     originalFirResolveSession.moduleProvider,
     originalFirResolveSession.moduleKindProvider,
     originalFirResolveSession.sessionProvider,
-    LLDependedScopeSessionProvider(originalFirResolveSession.project)
+    LLDependedScopeSessionProvider(originalFirResolveSession.project),
+    LLDependedDiagnosticProvider
 ) {
-    override val diagnosticProvider: LLDiagnosticProvider
-        get() = LLDependedDiagnosticProvider
-
     override fun getOrBuildFirFor(element: KtElement): FirElement? {
         val psi = FirElementBuilder.getPsiAsFirElementSource(element) ?: return null
         ktToFirMapping?.getFir(psi)?.let { return it }
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt
index a7e299857bf..1bc7f5957e7 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/api/LLFirResolveSession.kt
@@ -36,10 +36,9 @@ abstract class LLFirResolveSession(
     val moduleProvider: LLModuleProvider,
     val moduleKindProvider: LLModuleKindProvider,
     val sessionProvider: LLSessionProvider,
-    val scopeSessionProvider: LLScopeSessionProvider
+    val scopeSessionProvider: LLScopeSessionProvider,
+    val diagnosticProvider: LLDiagnosticProvider
 ) {
-    abstract val diagnosticProvider: LLDiagnosticProvider
-
     val useSiteKtModule: KtModule
         get() = moduleProvider.useSiteModule
 
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableResolveSession.kt
index 6686c0bad70..8c39d117953 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirLibraryOrLibrarySourceResolvableResolveSession.kt
@@ -14,11 +14,9 @@ internal class LLFirLibraryOrLibrarySourceResolvableResolveSession(
 ) : LLFirResolvableResolveSession(
     moduleProvider = moduleProvider,
     moduleKindProvider = LLLibraryModuleKindProvider(moduleProvider.useSiteModule),
-    sessionProvider = sessionProvider
-) {
-    override val diagnosticProvider: LLDiagnosticProvider
-        get() = LLEmptyDiagnosticProvider
-}
+    sessionProvider = sessionProvider,
+    diagnosticProvider = LLEmptyDiagnosticProvider
+)
 
 private class LLLibraryModuleKindProvider(private val useSiteModule: KtModule) : LLModuleKindProvider {
     override fun getKind(module: KtModule): KtModuleKind {
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirNotUnderContentRootResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirNotUnderContentRootResolveSession.kt
index f2bf2e06c98..6bc75fdc59a 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirNotUnderContentRootResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirNotUnderContentRootResolveSession.kt
@@ -13,11 +13,9 @@ internal class LLFirNotUnderContentRootResolveSession(
 ) : LLFirResolvableResolveSession(
     moduleProvider = moduleProvider,
     moduleKindProvider = LLNotUnderContentRootModuleKindProvider(moduleProvider.useSiteModule),
-    sessionProvider = sessionProvider
-) {
-    override val diagnosticProvider: LLDiagnosticProvider
-        get() = LLEmptyDiagnosticProvider
-}
+    sessionProvider = sessionProvider,
+    diagnosticProvider = LLEmptyDiagnosticProvider
+)
 
 private class LLNotUnderContentRootModuleKindProvider(private val useSiteModule: KtModule) : LLModuleKindProvider {
     override fun getKind(module: KtModule): KtModuleKind {
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt
index 18d8f4e2e64..eac45aa1446 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirResolvableResolveSession.kt
@@ -34,12 +34,14 @@ import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment
 internal abstract class LLFirResolvableResolveSession(
     moduleProvider: LLModuleProvider,
     moduleKindProvider: LLModuleKindProvider,
-    sessionProvider: LLSessionProvider
+    sessionProvider: LLSessionProvider,
+    diagnosticProvider: LLDiagnosticProvider
 ) : LLFirResolveSession(
     moduleProvider = moduleProvider,
     moduleKindProvider = moduleKindProvider,
     sessionProvider = sessionProvider,
-    scopeSessionProvider = LLDefaultScopeSessionProvider
+    scopeSessionProvider = LLDefaultScopeSessionProvider,
+    diagnosticProvider = diagnosticProvider
 ) {
     override fun getOrBuildFirFor(element: KtElement): FirElement? {
         val moduleComponents = getModuleComponentsForElement(element)
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirScriptResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirScriptResolveSession.kt
index a1de7de329f..c49effed154 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirScriptResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirScriptResolveSession.kt
@@ -14,10 +14,9 @@ internal class LLFirScriptResolveSession(
 ) : LLFirResolvableResolveSession(
     moduleProvider = moduleProvider,
     moduleKindProvider = LLScriptModuleKindProvider(moduleProvider.useSiteModule),
-    sessionProvider = sessionProvider
-) {
-    override val diagnosticProvider = LLSourceDiagnosticProvider(moduleProvider, sessionProvider)
-}
+    sessionProvider = sessionProvider,
+    diagnosticProvider = LLSourceDiagnosticProvider(moduleProvider, sessionProvider)
+)
 
 private class LLScriptModuleKindProvider(private val useSiteModule: KtModule) : LLModuleKindProvider {
     override fun getKind(module: KtModule): KtModuleKind {
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt
index 68fe57c130a..8586e9cd90a 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/state/LLFirSourceResolveSession.kt
@@ -17,10 +17,9 @@ internal class LLFirSourceResolveSession(
 ) : LLFirResolvableResolveSession(
     moduleProvider = moduleProvider,
     moduleKindProvider = LLSourceModuleKindProvider,
-    sessionProvider = sessionProvider
-) {
-    override val diagnosticProvider = LLSourceDiagnosticProvider(moduleProvider, sessionProvider)
-}
+    sessionProvider = sessionProvider,
+    diagnosticProvider = LLSourceDiagnosticProvider(moduleProvider, sessionProvider)
+)
 
 private object LLSourceModuleKindProvider : LLModuleKindProvider {
     override fun getKind(module: KtModule): KtModuleKind {