diff --git a/example/lib/single_conversation.dart b/example/lib/single_conversation.dart
index a7863fc0..92e6e205 100644
--- a/example/lib/single_conversation.dart
+++ b/example/lib/single_conversation.dart
@@ -25,12 +25,13 @@ import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 ///
 /// If you now run the simulator you will see a single channel UI.
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
   final client = Client(
     'b67pax5b2wdq',
     logLevel: Level.INFO,
   );
 
-  await client.setUser(
+  client.setUser(
     User(id: 'falling-mountain-7'),
     'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiZmFsbGluZy1tb3VudGFpbi03In0.AKgRXHMQQMz6vJAKszXdY8zMFfsAgkoUeZHlI-Szz9E',
   );
diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index cbdf9749..4d13a129 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -320,11 +320,7 @@ class _MessageListViewState extends State<MessageListView> {
     Stream<List<Message>> stream;
 
     if (widget.parentMessage == null) {
-      stream = streamChannel.channel.state.messagesStream.map((messages) =>
-          messages
-              .where((m) =>
-                  !(m.status == MessageSendingStatus.FAILED && m.isDeleted))
-              .toList());
+      stream = streamChannel.channel.state.messagesStream;
     } else {
       streamChannel.getReplies(widget.parentMessage.id);
       stream = streamChannel.channel.state.threadsStream
@@ -332,7 +328,12 @@ class _MessageListViewState extends State<MessageListView> {
           .map((threads) => threads[widget.parentMessage.id]);
     }
 
-    _streamListener = stream.listen((newMessages) {
+    _streamListener = stream
+        .map((messages) => messages
+            .where((m) =>
+                !(m.status == MessageSendingStatus.FAILED && m.isDeleted))
+            .toList())
+        .listen((newMessages) {
       newMessages = newMessages.reversed.toList();
       if (_messages.isEmpty ||
           newMessages.isEmpty ||
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 033d695b..5f71ca2c 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -909,7 +909,6 @@ class _MessageWidgetState extends State<MessageWidget>
           return GestureDetector(
             child: Image(image: provider),
             onTap: () {
-              print(attachment.toJson());
               Navigator.push(context, MaterialPageRoute(builder: (_) {
                 return FullScreenImage(
                   url: attachment.imageUrl ??