diff --git a/src/pubsub.c b/src/pubsub.c
index 2bd3d05807071aa7853d3c478a5318aec475389b..728e559c9e4c563067c5fd2ce8417fc9ec0b5061 100644
--- a/src/pubsub.c
+++ b/src/pubsub.c
@@ -141,7 +141,7 @@ int pubsubUnsubscribePattern(redisClient *c, robj *pattern, int notify) {
 /* Unsubscribe from all the channels. Return the number of channels the
  * client was subscribed from. */
 int pubsubUnsubscribeAllChannels(redisClient *c, int notify) {
-    dictIterator *di = dictGetIterator(c->pubsub_channels);
+    dictIterator *di = dictGetSafeIterator(c->pubsub_channels);
     dictEntry *de;
     int count = 0;