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 3e8543d59b0..e4b8ae55064 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
@@ -12,9 +12,16 @@ 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)
+    }
+
+    private var changedEnabledValue: Boolean? = null
+
     var enabled: Boolean
-        get() = PropertiesComponent.getInstance().getBoolean(optionName, ENABLED_BY_DEFAULT)
+        get() = changedEnabledValue ?: initialEnabledValue
         set(value) {
-            PropertiesComponent.getInstance().setValue(optionName, value, ENABLED_BY_DEFAULT)
+            changedEnabledValue = value
+            //PropertiesComponent.getInstance().setValue(optionName, value, ENABLED_BY_DEFAULT)
         }
 }
\ No newline at end of file