Merge branch 'master' into develop

packages/stream_chat/lib/src/api/channel.dart

@@ -1692,11 +1692,14 @@ class ChannelClientState {
 
   set _channelState(ChannelState v) {
     _channelStateController.add(v);
-    debounce(
-      timeout: Duration(milliseconds: 500),
-      target: _channel._client.chatPersistenceClient?.updateChannelState,
-      positionalArguments: [v],
-    );
+
+    if (_channel._client.persistenceEnabled) {
+      debounce(
+        timeout: Duration(milliseconds: 500),
+        target: _channel._client.chatPersistenceClient?.updateChannelState,
+        positionalArguments: [v],
+      );
+    }
   }
 
   /// The channel threads related to this channel

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;