diff --git a/packages/stream_chat/lib/src/client.dart b/packages/stream_chat/lib/src/client.dart
index 2c36f4f6..c5d5322f 100644
--- a/packages/stream_chat/lib/src/client.dart
+++ b/packages/stream_chat/lib/src/client.dart
@@ -611,7 +611,9 @@ class StreamChatClient {
         options: options,
         paginationParams: paginationParams,
         messageLimit: messageLimit,
-      );
+      ).whenComplete(() {
+        _queryChannelsStreams.remove(hash);
+      });
 
       _queryChannelsStreams[hash] = newQueryChannelsFuture;