diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
index f4e92a3cd..866b6b83f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
@@ -179,7 +179,8 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel {
                                     } else {
                                       return Single.just(verifyAccountWithoutKbsResponse);
                                     }
-                                  });
+                                  })
+                                  .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
   @Override
@@ -196,13 +197,14 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel {
                                       setCanCallAtTime(processor.getNextCodeViaCallAttempt());
                                     }
                                   })
-                                  .flatMap(processor -> {
+                                  .<ServiceResponse<VerifyResponse>>flatMap(processor -> {
                                     if (processor.isAlreadyVerified() || (processor.hasResult() && processor.isVerified())) {
                                       return verifyAccountRepository.registerAccount(sessionId, getRegistrationData(), pin, () -> Objects.requireNonNull(KbsRepository.restoreMasterKey(pin, kbsTokenData.getEnclave(), kbsTokenData.getBasicAuth(), kbsTokenData.getTokenResponse())));
                                     } else {
                                       return Single.just(ServiceResponse.coerceError(processor.getResponse()));
                                     }
-                                  });
+                                  })
+                                  .onErrorReturn(ServiceResponse::forUnknownError);
   }
 
   @Override