diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
index 7c2561e030..56c3c7577c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
@@ -99,9 +99,8 @@ public final class SignalPinReminderDialog {
     reminder.setMovementMethod(LinkMovementMethod.getInstance());
 
     PinVerifier.Callback callback = getPinWatcherCallback(context, dialog, pinEditText, pinStatus, mainCallback);
-    PinVerifier          verifier = SignalStore.kbsValues().isV2RegistrationLockEnabled()
-                                    ? new V2PinVerifier()
-                                    : new V1PinVerifier(context);
+    PinVerifier          verifier = SignalStore.kbsValues().hasPin() ? new V2PinVerifier()
+                                                                     : new V1PinVerifier(context);
 
     skip.setOnClickListener(v -> {
       dialog.dismiss();