diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
index b6b737da05..58a57aee13 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -129,14 +129,9 @@ object FcmFetchManager {
       if (highPriority) {
         this.highPriority = true
       }
-      val now = System.nanoTime()
-      val performedReplace = EXECUTOR.enqueue { fetch(context, now) }
-      if (performedReplace) {
-        Log.i(TAG, "Already have one running and one enqueued. Ignoring.")
-      } else {
-        last = now
-        Log.i(TAG, "Updating last event to $last")
-      }
+      last = System.nanoTime()
+      Log.i(TAG, "Updating last event to $last")
+      EXECUTOR.enqueue { fetch(context, last) }
     }
   }
 
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
index 0c7dccce8f..259d779b4e 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalWebSocket.java
@@ -276,6 +276,10 @@ public boolean readMessageBatch(long timeout, int batchSize, MessageReceivedCall
       callback.onMessageBatch(responses);
     }
 
+    if (!hitEndOfQueue && responses.size() < batchSize) {
+      Log.w(TAG, "Did not hit end of queue but responses.size < batchSize (" + responses.size() + " < " + batchSize + ")");
+    }
+
     return !hitEndOfQueue;
   }