diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
index 9e04cf2a32e..548bc2b543a 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
@@ -196,11 +196,15 @@ internal class KtFirScopeProvider(
             val availableScopes = towerDataElement.getAvailableScopes().flatMap { flattenFirScope(it) }
             availableScopes.map { IndexedValue(index, it) }
         }
-        val scopes = firScopes.map { (index, firScope) ->
+        val ktScopesWithKinds = createScopesWithKind(firScopes)
+
+        return KtScopeContext(ktScopesWithKinds, implicitReceivers, token)
+    }
+
+    private fun createScopesWithKind(firScopes: Iterable<IndexedValue<FirScope>>): List<KtScopeWithKind> {
+        return firScopes.map { (index, firScope) ->
             KtScopeWithKind(convertToKtScope(firScope), getScopeKind(firScope, index), token)
         }
-
-        return KtScopeContext(scopes, implicitReceivers, token)
     }
 
     private fun flattenFirScope(firScope: FirScope): List<FirScope> = when (firScope) {