diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index 4d13a129..7b2dc5f1 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -329,10 +329,12 @@ class _MessageListViewState extends State<MessageListView> {
     }
 
     _streamListener = stream
-        .map((messages) => messages
-            .where((m) =>
-                !(m.status == MessageSendingStatus.FAILED && m.isDeleted))
-            .toList())
+        .map((messages) =>
+            messages
+                ?.where((m) =>
+                    !(m.status == MessageSendingStatus.FAILED && m.isDeleted))
+                ?.toList() ??
+            [])
         .listen((newMessages) {
       newMessages = newMessages.reversed.toList();
       if (_messages.isEmpty ||
diff --git a/lib/src/stream_channel.dart b/lib/src/stream_channel.dart
index 2943441e..70357b65 100644
--- a/lib/src/stream_channel.dart
+++ b/lib/src/stream_channel.dart
@@ -76,7 +76,6 @@ class StreamChannelState extends State<StreamChannel> {
   /// Calls [channel.getReplies] updating [queryMessage] stream
   Future<void> getReplies(String parentId) async {
     _queryMessageController.add(true);
-    print('PARENT $parentId');
 
     String firstId;
     if (widget.channel.state.threads.containsKey(parentId)) {