diff --git a/CHANGELOG.md b/CHANGELOG.md
index c91502be..3b81cbe3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.18
+
+- Updated llc dependency
+
 ## 0.2.17+2
 
 - Expose ChannelsBloc.channelsComparator to sort channels on message.new event
diff --git a/lib/src/channels_bloc.dart b/lib/src/channels_bloc.dart
index 59dd6335..0784cb30 100644
--- a/lib/src/channels_bloc.dart
+++ b/lib/src/channels_bloc.dart
@@ -89,29 +89,24 @@ class ChannelsBlocState extends State<ChannelsBloc>
           paginationParams.offset == null ||
           paginationParams.offset == 0;
       final oldChannels = List<Channel>.from(channels ?? []);
-      client
-          .queryChannels(
+      final _channels = await client.queryChannels(
         filter: filter,
         sort: sortOptions,
         options: options,
         paginationParams: paginationParams,
         onlyOffline: onlyOffline,
-      )
-          .listen((channels) {
-        if (clear) {
-          _channelsController.add(channels);
-        } else {
-          final l = oldChannels + channels;
-          _channelsController.add(l);
-        }
-      }, onDone: () {
-        _queryChannelsLoadingController.sink.add(false);
-      }, onError: (err, stackTrace) {
-        print(err);
-        print(stackTrace);
-        _queryChannelsLoadingController.addError(err, stackTrace);
-      });
+      );
+
+      if (clear) {
+        _channelsController.add(_channels);
+      } else {
+        final l = oldChannels + _channels;
+        _channelsController.add(l);
+      }
+      _queryChannelsLoadingController.sink.add(false);
     } catch (err, stackTrace) {
+      print(err);
+      print(stackTrace);
       _queryChannelsLoadingController.addError(err, stackTrace);
     }
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index dd5273b7..0da226b7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 0.2.17+2
+version: 0.2.18
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -23,7 +23,7 @@ dependencies:
   file_picker: ^2.0.12
   image_picker: ^0.6.7+2
   flutter_keyboard_visibility: ^4.0.1
-  stream_chat: ^0.2.13
+  stream_chat: ^0.2.20
   mime: ^0.9.6+3
   visibility_detector: ^0.1.5
   http_parser: ^3.1.4