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 e915df263..d9cc58bad 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -36,6 +36,7 @@ import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStor
 import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.Config
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.perf.StrictModeManager
 import org.mozilla.fenix.components.metrics.Event
@@ -93,12 +94,13 @@ class BackgroundServices(
 
     @VisibleForTesting
     val supportedEngines =
-        setOf(
+        setOfNotNull(
             SyncEngine.History,
             SyncEngine.Bookmarks,
             SyncEngine.Passwords,
             SyncEngine.Tabs,
-            SyncEngine.CreditCards
+            SyncEngine.CreditCards,
+            if (FeatureFlags.addressesFeature) SyncEngine.Addresses else null
         )
     private val syncConfig =
         SyncConfig(supportedEngines, PeriodicSyncConfig(periodMinutes = 240)) // four hours
@@ -116,6 +118,9 @@ class BackgroundServices(
             storePair = SyncEngine.CreditCards to creditCardsStorage,
             keyProvider = lazy { creditCardKeyProvider }
         )
+        if (FeatureFlags.addressesFeature) {
+            GlobalSyncableStoreProvider.configureStore(SyncEngine.Addresses to creditCardsStorage)
+        }
     }
 
     private val telemetryAccountObserver = TelemetryAccountObserver(