diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 352e3177196..d1464d32369 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -354,6 +354,8 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
             preferenceScreen.addPreference(mButtonWfcMode);
             if (updateAddressEnabled) {
                 preferenceScreen.addPreference(mUpdateAddress);
+            } else {
+                preferenceScreen.removePreference(mUpdateAddress);
             }
         } else {
             preferenceScreen.removePreference(mButtonWfcMode);