diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyCodeWithRegistrationLockResponseProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyCodeWithRegistrationLockResponseProcessor.kt
index 62d400690e..2a1d064fc8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyCodeWithRegistrationLockResponseProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/VerifyCodeWithRegistrationLockResponseProcessor.kt
@@ -27,6 +27,10 @@ class VerifyCodeWithRegistrationLockResponseProcessor(
     return super.getError()
   }
 
+  public override fun registrationLock(): Boolean {
+    return super.registrationLock()
+  }
+
   fun wrongPin(): Boolean {
     return error is KeyBackupSystemWrongPinException
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
index 98cf0d430f..fde2fe07e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
@@ -180,7 +180,7 @@ public abstract class BaseRegistrationLockFragment extends LoggingFragment {
                                      handleSuccessfulPinEntry(pin);
                                    } else if (processor.wrongPin()) {
                                      onIncorrectKbsRegistrationLockPin(processor.getToken());
-                                   } else if (processor.isKbsLocked()) {
+                                   } else if (processor.isKbsLocked() || processor.registrationLock()) {
                                      onKbsAccountLocked();
                                    } else if (processor.rateLimit()) {
                                      onRateLimited();