diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index 29746935561d..874db628f5d8 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -31,7 +31,6 @@ import mozilla.components.service.fxa.manager.SCOPE_SYNC
 import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider
 import mozilla.components.service.sync.logins.SyncableLoginsStore
 import mozilla.components.support.base.log.logger.Logger
-import org.mozilla.fenix.Config
 import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -72,9 +71,8 @@ class BackgroundServices(
         capabilities = setOf(DeviceCapability.SEND_TAB),
 
         // Enable encryption for account state on supported API levels (23+).
-        // Just on Nightly and local builds for now.
-        // Enabling this for all channels is tracked in https://github.com/mozilla-mobile/fenix/issues/6704
-        secureStateAtRest = Config.channel.isNightlyOrDebug
+        // Enabling it for all channels
+        secureStateAtRest = true
     )
     // If sync has been turned off on the server then disable syncing.
     @Suppress("ConstantConditionIf")