diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
index 4b1edf4ce4b..b7292d37be3 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
@@ -58,7 +58,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.runUnless
 
 class DeclarationsConverter(
     session: FirSession,
-    private val baseScopeProvider: FirScopeProvider,
+    internal val baseScopeProvider: FirScopeProvider,
     tree: FlyweightCapableTreeStructure<LighterASTNode>,
     @set:PrivateForInline override var offset: Int = 0,
     context: Context<LighterASTNode> = Context(),
diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
index 49f1ff5d691..0cabbe17c57 100644
--- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
@@ -74,10 +74,12 @@ class ExpressionsConverter(
                 val lambdaTree = LightTree2Fir.buildLightTreeLambdaExpression(expression.asText)
                 // Pass on label user to the lambda root
                 context.forwardLabelUsagePermission(expression, lambdaTree.root)
-                declarationsConverter.withOffset(offset + expression.startOffset) {
-                    ExpressionsConverter(baseSession, lambdaTree, declarationsConverter, context)
-                        .convertLambdaExpression(lambdaTree.root)
-                }
+                val lambdaDeclarationsConverter = DeclarationsConverter(
+                    baseSession, declarationsConverter.baseScopeProvider, lambdaTree,
+                    offset = offset + expression.startOffset, context
+                )
+                ExpressionsConverter(baseSession, lambdaTree, lambdaDeclarationsConverter, context)
+                    .convertLambdaExpression(lambdaTree.root)
             }
             BINARY_EXPRESSION -> convertBinaryExpression(expression)
             BINARY_WITH_TYPE -> convertBinaryWithTypeRHSExpression(expression) {