diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
index b86a0bb157..e01300ae2d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/advanced/AdvancedPrivacySettingsViewModel.kt
@@ -30,6 +30,7 @@ class AdvancedPrivacySettingsViewModel(
         AdvancedPrivacySettingsRepository.DisablePushMessagesResult.SUCCESS -> {
           TextSecurePreferences.setPushRegistered(ApplicationDependencies.getApplication(), false)
           SignalStore.registrationValues().clearRegistrationComplete()
+          SignalStore.registrationValues().clearHasUploadedProfile()
         }
         AdvancedPrivacySettingsRepository.DisablePushMessagesResult.NETWORK_ERROR -> {
           singleEvents.postValue(Event.DISABLE_PUSH_FAILED)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
index 8aed3ee92f..277c1e24c3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
@@ -55,4 +55,8 @@ public final class RegistrationValues extends SignalStoreValues {
   public void markHasUploadedProfile() {
     putBoolean(HAS_UPLOADED_PROFILE, true);
   }
+
+  public void clearHasUploadedProfile() {
+    putBoolean(HAS_UPLOADED_PROFILE, false);
+  }
 }