diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
index 6bb27551c1..d1fbb22b3b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
@@ -359,7 +359,7 @@ public final class SettingsValues extends SignalStoreValues {
   public void setDefaultSms(boolean value) {
     boolean lastKnown = getBoolean(DEFAULT_SMS, false);
 
-    if (value != lastKnown) {
+    if (value != lastKnown && SignalStore.registrationValues().isRegistrationComplete()) {
       Log.i(TAG, "Default SMS state changed! Scheduling a storage sync.");
       putBoolean(DEFAULT_SMS, value);