diff --git a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
index 1a29160691..f2312ed15b 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
@@ -91,7 +91,10 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() {
         )
 
         updateSaveAndAutofillCardsSwitch()
-        updateSaveAndAutofillAddressesSwitch()
+
+        if (requireComponents.settings.addressFeature) {
+            updateSaveAndAutofillAddressesSwitch()
+        }
     }
 
     /**