diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
index 387b2993e..40ea5d372 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -472,6 +472,10 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
   void removeRecipientViewFromMrmData(final List<byte[]> sharedMrmKeys, final UUID accountUuid,
       final byte deviceId) {
 
+    if (sharedMrmKeys.isEmpty()) {
+      return;
+    }
+
     final Timer.Sample sample = Timer.start();
     Flux.fromIterable(sharedMrmKeys)
         .collectMultimap(SlotHash::getSlot)