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 2a17b811f2..10c5b28550 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
@@ -499,7 +499,14 @@ class RegistrationViewModel : ViewModel() {
       Log.d(TAG, "Requesting push challenge token…")
       val pushSubmissionResult = RegistrationRepository.requestAndVerifyPushToken(context, session.sessionId, e164, password)
       Log.d(TAG, "Push challenge token submitted.", true)
-      handleSessionStateResult(context, pushSubmissionResult)
+      val success = handleSessionStateResult(context, pushSubmissionResult)
+
+      if (!success) {
+        Log.i(TAG, "Push challenge was not successful, removing from challenge list to allow fallback.")
+        store.update {
+          it.copy(challengesRequested = it.challengesRequested.minus(Challenge.PUSH), inProgress = false)
+        }
+      }
     }
   }