diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirFileAnnotationBuilder.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirFileAnnotationBuilder.kt
index dd43931701d..4ebd7480267 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirFileAnnotationBuilder.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/lazy/resolve/RawFirFileAnnotationBuilder.kt
@@ -29,7 +29,7 @@ internal fun buildFileFirAnnotation(
         }
     }
     builder.context.packageFqName = fileAnnotation.containingKtFile.packageFqName
-    val result = builder.VisitorWithReplacement().convertElement(fileAnnotation) as FirAnnotation
+    val result = builder.VisitorWithReplacement().convertElement(fileAnnotation, null) as FirAnnotation
     replacementApplier?.ensureApplied()
     return result
 }
diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
index ca427342610..1a24012ba2c 100644
--- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
@@ -164,10 +164,10 @@ open class RawFirBuilder(
 
     protected open inner class Visitor : KtVisitor<FirElement, FirElement?>() {
         private inline fun <reified R : FirElement> KtElement?.convertSafe(): R? =
-            this?.let(::convertElement) as? R
+            this?.let { convertElement(it, null)} as? R
 
         private inline fun <reified R : FirElement> KtElement.convert(): R =
-            convertElement(this) as R
+            convertElement(this, null) as R
 
         private inline fun <T> buildOrLazy(build: () -> T, noinline lazy: () -> T): T {
             return when (mode) {
@@ -262,7 +262,7 @@ open class RawFirBuilder(
                 return buildErrorExpression(source = null, diagnosticFn())
             }
 
-            val result = when (val fir = convertElement(this)) {
+            val result = when (val fir = convertElement(this, null)) {
                 is FirExpression -> fir
                 else -> {
                     return buildErrorExpression {
@@ -298,7 +298,7 @@ open class RawFirBuilder(
         }
 
         private inline fun KtExpression.toFirStatement(errorReasonLazy: () -> String): FirStatement {
-            return when (val fir = convertElement(this)) {
+            return when (val fir = convertElement(this, null)) {
                 is FirStatement -> fir
                 else -> buildErrorExpression {
                     nonExpressionElement = fir