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 bbe7b564d..17938f661 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -330,9 +330,12 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
   }
 
   private void unsubscribeFromKeyspaceNotifications(final String queueName) {
-    pubSubConnection.usePubSubConnection(connection -> connection.sync().upstream()
-        .commands()
-        .unsubscribe(getKeyspaceChannels(queueName)));
+    final int slot = SlotHash.getSlot(queueName);
+
+    pubSubConnection.usePubSubConnection(
+        connection -> connection.sync().nodes(node -> node.is(RedisClusterNode.NodeFlag.UPSTREAM) && node.hasSlot(slot))
+            .commands()
+            .unsubscribe(getKeyspaceChannels(queueName)));
   }
 
   private static String[] getKeyspaceChannels(final String queueName) {