diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt
index dc7d9b7376..7931fa9956 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/RegistrationActivity.kt
@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.registration.sms.SmsRetrieverReceiver
+import org.thoughtcrime.securesms.registration.util.RegistrationUtil
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 
 /**
@@ -46,6 +47,7 @@ class RegistrationActivity : BaseActivity() {
 
     sharedViewModel.checkpoint.observe(this) {
       if (it >= RegistrationCheckpoint.LOCAL_REGISTRATION_COMPLETE) {
+        RegistrationUtil.maybeMarkRegistrationComplete()
         handleSuccessfulVerify()
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt
index b80d560149..5429fa68c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/RemoteRestoreActivity.kt
@@ -72,6 +72,7 @@ import org.thoughtcrime.securesms.components.contactsupport.ContactSupportViewMo
 import org.thoughtcrime.securesms.components.contactsupport.SendSupportEmailEffect
 import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.registration.util.RegistrationUtil
 import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreen
 import org.thoughtcrime.securesms.registrationv3.ui.shared.RegistrationScreenTitleSubtitle
 import org.thoughtcrime.securesms.util.DateUtils
@@ -117,6 +118,7 @@ class RemoteRestoreActivity : BaseActivity() {
           .firstOrNull()
 
         if (restored != null) {
+          RegistrationUtil.maybeMarkRegistrationComplete()
           startActivity(MainActivity.clearTop(this@RemoteRestoreActivity))
           finishAffinity()
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt
index c0d79b6f6c..0218af858f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/StorageServiceRestore.kt
@@ -50,8 +50,8 @@ object StorageServiceRestore {
 
       val isMissingProfileData = RegistrationRepository.isMissingProfileData()
 
+      RegistrationUtil.maybeMarkRegistrationComplete()
       if (!isMissingProfileData) {
-        RegistrationUtil.maybeMarkRegistrationComplete()
         AppDependencies.jobManager.add(ProfileUploadJob())
       }
     }