diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
index 2fa0281297..80e6b85c9f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt
@@ -165,7 +165,7 @@ class MessageBackupsFlowFragment : ComposeFragment(), InAppPaymentCheckoutDelega
             MessageBackupsKeyRecordMode.Passkey(
               onSaveToPasswordManager = viewModel::onBackupKeySaveRequested,
               onSaveManually = viewModel::goToRecordManually,
-              onSaveSuccessful = viewModel::goToNextStage
+              onSaveSuccessful = viewModel::onBackupKeySavedToPasswordManager
             )
           },
           onCopyToClipboardClick = { Util.copyToClipboard(context, it, CLIPBOARD_TIMEOUT_SECONDS) },
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
index 7ff25cfc7e..18a6efbd8e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt
@@ -279,6 +279,11 @@ class MessageBackupsFlowViewModel(
     }
   }
 
+  fun onBackupKeySavedToPasswordManager() {
+    SignalStore.backup.lastVerifyKeyTime = System.currentTimeMillis()
+    goToNextStage()
+  }
+
   fun goToRecordManually() {
     internalStateFlow.update {
       it.copy(stage = MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY)