diff --git a/src/org/thoughtcrime/securesms/gcm/FcmJobService.java b/src/org/thoughtcrime/securesms/gcm/FcmJobService.java
index 25c0bf9654..04da03106e 100644
--- a/src/org/thoughtcrime/securesms/gcm/FcmJobService.java
+++ b/src/org/thoughtcrime/securesms/gcm/FcmJobService.java
@@ -41,7 +41,7 @@ public class FcmJobService extends JobService {
   public boolean onStartJob(JobParameters params) {
     Log.d(TAG, "onStartJob()");
 
-    if (ApplicationContext.getInstance(getApplicationContext()).isAppVisible()) {
+    if (MessageRetriever.shouldIgnoreFetch(this)) {
       Log.i(TAG, "App is foregrounded. No need to run.");
       return false;
     }
diff --git a/src/org/thoughtcrime/securesms/gcm/MessageRetriever.java b/src/org/thoughtcrime/securesms/gcm/MessageRetriever.java
index 920cdeca04..4cb5d23af5 100644
--- a/src/org/thoughtcrime/securesms/gcm/MessageRetriever.java
+++ b/src/org/thoughtcrime/securesms/gcm/MessageRetriever.java
@@ -7,12 +7,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.PowerManagerCompat;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.WakeLockUtil;
 
 import java.util.concurrent.Semaphore;
@@ -34,7 +34,7 @@ public class MessageRetriever {
    */
   @WorkerThread
   public boolean retrieveMessages(@NonNull Context context, Strategy... strategies) {
-    if (ApplicationContext.getInstance(context).isAppVisible()) {
+    if (shouldIgnoreFetch(context)) {
       Log.i(TAG, "Skipping retrieval -- app is in the foreground.");
       return true;
     }
@@ -64,7 +64,7 @@ public class MessageRetriever {
         boolean success = false;
 
         for (Strategy strategy : strategies) {
-          if (ApplicationContext.getInstance(context).isAppVisible()) {
+          if (shouldIgnoreFetch(context)) {
             Log.i(TAG, "Stopping further strategy attempts -- app is in the foreground." + logSuffix(startTime));
             success = true;
             break;
@@ -95,6 +95,15 @@ public class MessageRetriever {
     }
   }
 
+  /**
+   * @return True if there is no need to execute a message fetch, because the websocket will take
+   *         care of it.
+   */
+  public static boolean shouldIgnoreFetch(@NonNull Context context) {
+    return ApplicationContext.getInstance(context).isAppVisible() &&
+           !ApplicationDependencies.getSignalServiceNetworkAccess().isCensored(context);
+  }
+
   private static String logSuffix(long startTime) {
     return " (" + (System.currentTimeMillis() - startTime) + " ms elapsed)";
   }