diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
index ce620523f..ff1b39344 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
@@ -43,7 +43,6 @@ public final class ProfileUploadJob extends BaseJob {
     }
 
     ProfileUtil.uploadProfile(context);
-    SignalStore.registrationValues().markHasUploadedProfile();
     Log.i(TAG, "Profile uploaded.");
   }
 
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 277c1e24c..0b955064c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
@@ -18,6 +18,7 @@ public final class RegistrationValues extends SignalStoreValues {
 
   public synchronized void onFirstEverAppLaunch() {
     getStore().beginWrite()
+              .putBoolean(HAS_UPLOADED_PROFILE, false)
               .putBoolean(REGISTRATION_COMPLETE, false)
               .putBoolean(PIN_REQUIRED, true)
               .commit();
@@ -49,7 +50,7 @@ public final class RegistrationValues extends SignalStoreValues {
   }
 
   public boolean hasUploadedProfile() {
-    return getBoolean(HAS_UPLOADED_PROFILE, false);
+    return getBoolean(HAS_UPLOADED_PROFILE, true);
   }
 
   public void markHasUploadedProfile() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
index 62434c198..729909d3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ProfileUtil.java
@@ -292,7 +292,7 @@ public final class ProfileUtil {
                                                                                     Optional.fromNullable(paymentsAddress),
                                                                                     avatar,
                                                                                     badgeIds).orNull();
-
+    SignalStore.registrationValues().markHasUploadedProfile();
     DatabaseFactory.getRecipientDatabase(context).setProfileAvatar(Recipient.self().getId(), avatarPath);
   }