diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
index 6b93cb5cdd..5ac565db4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
@@ -430,6 +430,7 @@ class ChangeNumberViewModel : ViewModel() {
       is VerificationCodeRequestResult.RegistrationLocked ->
         store.update {
           it.copy(
+            lockedTimeRemaining = result.timeRemaining,
             svr2Credentials = result.svr2Credentials,
             svr3Credentials = result.svr3Credentials
           )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
index fb93f80d53..ca6afcb51c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt
@@ -513,7 +513,12 @@ class RegistrationViewModel : ViewModel() {
 
       is TokenNotAccepted -> Log.i(TAG, "Received TokenNotAccepted.", sessionResult.getCause())
 
-      is RegistrationLocked -> Log.i(TAG, "Received RegistrationLocked.", sessionResult.getCause())
+      is RegistrationLocked -> {
+        store.update {
+          it.copy(lockedTimeRemaining = sessionResult.timeRemaining)
+        }
+        Log.i(TAG, "Received RegistrationLocked.", sessionResult.getCause())
+      }
 
       is NoSuchSession -> Log.i(TAG, "Received NoSuchSession.", sessionResult.getCause())
 
@@ -763,6 +768,10 @@ class RegistrationViewModel : ViewModel() {
 
     if (result is RegisterAccountResult.RegistrationLocked) {
       Log.d(TAG, "Registration lock response received.")
+      val timeRemaining = result.timeRemaining
+      store.update {
+        it.copy(lockedTimeRemaining = timeRemaining)
+      }
       reglock = true
       if (pin == null && SignalStore.svr.registrationLockToken != null) {
         Log.d(TAG, "Retrying registration with stored credentials.")