diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
index 6da7d66819..f2db2f32ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/SignalPinReminderSchedule.java
@@ -1,7 +1,9 @@
 package org.thoughtcrime.securesms.megaphone;
 
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 final class SignalPinReminderSchedule implements MegaphoneSchedule {
 
@@ -19,6 +21,10 @@ final class SignalPinReminderSchedule implements MegaphoneSchedule {
       return false;
     }
 
+    if (!TextSecurePreferences.isPushRegistered(ApplicationDependencies.getApplication())) {
+      return false;
+    }
+
     long lastSuccessTime = SignalStore.pinValues().getLastSuccessfulEntryTime();
     long interval        = SignalStore.pinValues().getCurrentInterval();