diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index ee54213be..bce9c4d20 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -417,8 +417,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                 onNimbusStartupAndUpdate()
             }
         })
-
-        onNimbusStartupAndUpdate()
     }
 
     private fun onNimbusStartupAndUpdate() {
diff --git a/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt b/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt
index e363b67b6..a3179d29c 100644
--- a/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/settings/FeatureFlagPreference.kt
@@ -26,15 +26,12 @@ fun featureFlagPreference(key: String, default: Boolean, featureFlag: Boolean) =
 
 private class LazyPreference(val key: String, val default: () -> Boolean) :
     ReadWriteProperty<PreferencesHolder, Boolean> {
-    private val property: ReadWriteProperty<PreferencesHolder, Boolean> by lazy {
-        booleanPreference(key, default())
-    }
 
     override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>) =
-        this.property.getValue(thisRef, property)
+        thisRef.preferences.getBoolean(key, default())
 
     override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Boolean) =
-        this.property.setValue(thisRef, property, value)
+        thisRef.preferences.edit().putBoolean(key, value).apply()
 }
 
 /**
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 2b535219e..d832689ce 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -1203,9 +1203,8 @@ class Settings(private val appContext: Context) : PreferencesHolder {
         default = false
     )
 
-    private val homescreenSections: Map<HomeScreenSection, Boolean> by lazy {
+    private val homescreenSections: Map<HomeScreenSection, Boolean> get() =
         FxNimbus.features.homescreen.value().sectionsEnabled
-    }
 
     var historyMetadataUIFeature by lazyFeatureFlagPreference(
         appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),