diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
index 8f48bb476..369967cdb 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
@@ -92,7 +92,7 @@ public class MessagePersister implements Managed {
             }
 
             queuesPersisted += queuesToPersist.size();
-        } while (queuesToPersist.size() == QUEUE_BATCH_LIMIT);
+        } while (queuesToPersist.size() >= QUEUE_BATCH_LIMIT);
 
         queueCountHistogram.update(queuesPersisted);
     }