diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
index 9963a55209..89649be63e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
@@ -35,6 +35,7 @@ object StorageServiceRestore {
       val stopwatch = Stopwatch("storage-service-restore")
 
       SignalStore.storageService.needsAccountRestore = false
+      SignalStore.onboarding.clearAll()
 
       AppDependencies.jobManager.runJobBlocking(StorageAccountRestoreJob(), StorageAccountRestoreJob.LIFESPAN.milliseconds)
       stopwatch.split("account-restore")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
index 37caf51069..b868d7337a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/local/RestoreLocalBackupActivityViewModel.kt
@@ -143,7 +143,6 @@ class RestoreLocalBackupActivityViewModel : ViewModel() {
           Log.w(TAG, "Local backup does not match current account, not re-enabling local backups")
         }
 
-        SignalStore.onboarding.clearAll()
         StorageServiceRestore.restore()
         RegistrationUtil.maybeMarkRegistrationComplete()