diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolution.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolution.kt
index e4b8ae55064..7ffa22628a7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolution.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolution.kt
@@ -5,15 +5,14 @@
 
 package org.jetbrains.kotlin.idea.fir
 
-import com.intellij.ide.util.PropertiesComponent
+import com.intellij.openapi.util.registry.Registry
 
 // Just a wrapper to see whether resolve works via FIR or not
 object FirResolution {
-    private const val ENABLED_BY_DEFAULT = false
     private const val optionName = "kotlin.use.fir.resolution"
 
     private val initialEnabledValue: Boolean by lazy {
-        PropertiesComponent.getInstance().getBoolean(optionName, ENABLED_BY_DEFAULT)
+        Registry.`is`(optionName, /* defaultValue = */ false)
     }
 
     private var changedEnabledValue: Boolean? = null
@@ -22,6 +21,5 @@ object FirResolution {
         get() = changedEnabledValue ?: initialEnabledValue
         set(value) {
             changedEnabledValue = value
-            //PropertiesComponent.getInstance().setValue(optionName, value, ENABLED_BY_DEFAULT)
         }
 }
\ No newline at end of file
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index b37d72b5132..3e76a64577e 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -112,6 +112,10 @@
                      description="Add all transitive dependencies on MPP modules when Android project is imported"
                      defaultValue="true"
                      restartRequired="false"/>
+        <registryKey key="kotlin.use.fir.resolution"
+                     description="Use Kotlin resolution via frontend IR for reference resolve and diagnostics in IDEA"
+                     defaultValue="false"
+                     restartRequired="true"/>
         <registryKey key="kotlin.gradle.scripts.useIdeaProjectImport"
                      description="Use IDEA project import mechanics to load Kotlin Gradle scripts configuration"
                      defaultValue="false"
diff --git a/idea/resources/META-INF/extensions/ide.xml.183 b/idea/resources/META-INF/extensions/ide.xml.183
index 4da9395cd4d..56c1b746472 100644
--- a/idea/resources/META-INF/extensions/ide.xml.183
+++ b/idea/resources/META-INF/extensions/ide.xml.183
@@ -116,6 +116,10 @@
                      description="Add all transitive dependencies on MPP modules when Android project is imported"
                      defaultValue="true"
                      restartRequired="false"/>
+        <registryKey key="kotlin.use.fir.resolution"
+                     description="Use Kotlin resolution via frontend IR for reference resolve and diagnostics in IDEA"
+                     defaultValue="false"
+                     restartRequired="true"/>
         <fileEditorProvider implementation="org.jetbrains.kotlin.idea.scratch.ui.KtScratchFileEditorProvider"/>
 
     </extensions>
diff --git a/idea/resources/META-INF/extensions/ide.xml.as34 b/idea/resources/META-INF/extensions/ide.xml.as34
index 1ce198d0a96..d4821532d1a 100644
--- a/idea/resources/META-INF/extensions/ide.xml.as34
+++ b/idea/resources/META-INF/extensions/ide.xml.as34
@@ -107,6 +107,10 @@
                      description="Add all transitive dependencies on MPP modules when Android project is imported"
                      defaultValue="true"
                      restartRequired="false"/>
+            <registryKey key="kotlin.use.fir.resolution"
+                     description="Use Kotlin resolution via frontend IR for reference resolve and diagnostics in IDEA"
+                     defaultValue="false"
+                     restartRequired="true"/>
             <fileEditorProvider implementation="org.jetbrains.kotlin.idea.scratch.ui.KtScratchFileEditorProvider"/>
 
     </extensions>