diff --git a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
index 4d257c9737..7d7ad0b0f2 100644
--- a/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
+++ b/src/org/thoughtcrime/securesms/service/MessageRetrievalService.java
@@ -144,7 +144,8 @@ public class MessageRetrievalService extends Service implements InjectableType,
     Log.w(TAG, String.format("Network requirement: %s, active activities: %s, push pending: %s, gcm disabled: %b",
                              networkRequirement.isPresent(), activeActivities, pushPending.size(), isGcmDisabled));
 
-    return TextSecurePreferences.isWebsocketRegistered(this)                  &&
+    return TextSecurePreferences.isPushRegistered(this)                       &&
+           TextSecurePreferences.isWebsocketRegistered(this)                  &&
            (activeActivities > 0 || !pushPending.isEmpty() || isGcmDisabled)  &&
            networkRequirement.isPresent();
   }