diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirNativeSessionFactory.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirNativeSessionFactory.kt
index 6e3051bec8d..4540921ed46 100644
--- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirNativeSessionFactory.kt
+++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirNativeSessionFactory.kt
@@ -41,8 +41,7 @@ object FirNativeSessionFactory : FirAbstractSessionFactory() {
             extensionRegistrars,
             registerExtraComponents = { session ->
                 session.registerDefaultComponents()
-                session.register(FirPlatformClassMapper::class, FirNativeClassMapper())
-                session.register(FirPlatformSpecificCastChecker::class, FirNativeCastChecker)
+                session.registerNativeComponents()
                 registerExtraComponents(session)
             },
             createKotlinScopeProvider = { FirKotlinScopeProvider() },
@@ -88,8 +87,7 @@ object FirNativeSessionFactory : FirAbstractSessionFactory() {
             init,
             registerExtraComponents = {
                 it.registerDefaultComponents()
-                it.register(FirPlatformClassMapper::class, FirNativeClassMapper())
-                it.register(FirPlatformSpecificCastChecker::class, FirNativeCastChecker)
+                it.registerNativeComponents()
                 registerExtraComponents(it)
             },
             registerExtraCheckers = { it.registerNativeCheckers() },
@@ -103,4 +101,10 @@ object FirNativeSessionFactory : FirAbstractSessionFactory() {
             }
         )
     }
+
+    @OptIn(SessionConfiguration::class)
+    fun FirSession.registerNativeComponents() {
+        register(FirPlatformClassMapper::class, FirNativeClassMapper())
+        register(FirPlatformSpecificCastChecker::class, FirNativeCastChecker)
+    }
 }