diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
index 648e047842..20d547a4b0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
@@ -181,6 +181,12 @@ public final class PinState {
   @WorkerThread
   public static synchronized void onEnableRegistrationLockForUserWithPin() throws IOException {
     Log.i(TAG, "onEnableRegistrationLockForUserWithPin()");
+
+    if (getState() == State.PIN_WITH_REGISTRATION_LOCK_ENABLED) {
+      Log.i(TAG, "Registration lock already enabled. Skipping.");
+      return;
+    }
+
     assertState(State.PIN_WITH_REGISTRATION_LOCK_DISABLED);
 
     SignalStore.kbsValues().setV2RegistrationLockEnabled(false);
@@ -198,6 +204,12 @@ public final class PinState {
   @WorkerThread
   public static synchronized void onDisableRegistrationLockForUserWithPin() throws IOException {
     Log.i(TAG, "onDisableRegistrationLockForUserWithPin()");
+
+    if (getState() == State.PIN_WITH_REGISTRATION_LOCK_DISABLED) {
+      Log.i(TAG, "Registration lock already disabled. Skipping.");
+      return;
+    }
+
     assertState(State.PIN_WITH_REGISTRATION_LOCK_ENABLED);
 
     SignalStore.kbsValues().setV2RegistrationLockEnabled(true);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
index 4c94ead3bf..c0e111c29a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -194,6 +194,7 @@ public final class FeatureFlags {
   public static boolean pinsForAll() {
     return SignalStore.registrationValues().pinWasRequiredAtRegistration() ||
            SignalStore.kbsValues().isV2RegistrationLockEnabled()           ||
+           SignalStore.kbsValues().hasPin()                                ||
            pinsForAllMandatory()                                           ||
            getValue(PINS_FOR_ALL_LEGACY, false)                            ||
            getValue(PINS_FOR_ALL, false);