diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index e8d4cec875..5daa8d181c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -185,7 +185,9 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private boolean userMustSetKbsPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !PinUtil.userHasPin(this);
+    // TODO [greyson] [pins] Maybe re-enable in the future
+//    return !SignalStore.registrationValues().isRegistrationComplete() && !PinUtil.userHasPin(this);
+    return false;
   }
 
   private boolean userMustSetProfileName() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
index e51fb02475..28f9dc87c9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
@@ -129,6 +129,6 @@ public final class KbsValues {
   }
 
   public boolean hasMigratedToPinsForAll() {
-    return store.getString(KEYBOARD_TYPE, null) != null;
+    return store.getString(KEYBOARD_TYPE, null) != null && store.getBoolean(V2_LOCK_ENABLED, false);
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
index a85be18f28..045fdcf1b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/RegistrationValues.java
@@ -17,7 +17,8 @@ public final class RegistrationValues {
   public synchronized void onNewInstall() {
     store.beginWrite()
          .putBoolean(REGISTRATION_COMPLETE, false)
-         .putBoolean(PIN_REQUIRED, true)
+         // TODO [greyson] [pins] Maybe re-enable in the future
+//         .putBoolean(PIN_REQUIRED, true)
          .commit();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
index 26f97ff602..aa0bb08b5e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
@@ -26,7 +26,7 @@ class PinsForAllSchedule implements MegaphoneSchedule {
 
   static boolean shouldDisplayFullScreen(long firstVisible, long currentTime) {
     return false;
-    // TODO [greyson]
+    // TODO [greyson] [pins] Maybe re-enable if we ever do a blocking flow again
 //    if (pinCreationFailedDuringRegistration()) {
 //      return true;
 //    }
@@ -74,6 +74,10 @@ class PinsForAllSchedule implements MegaphoneSchedule {
       return false;
     }
 
+    if (SignalStore.kbsValues().hasMigratedToPinsForAll()) {
+      return false;
+    }
+
     return FeatureFlags.pinsForAll();
   }