diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
index 7735a956..9cfc3464 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -251,14 +251,14 @@ class StreamChannelState extends State<StreamChannel> {
     channel.state!.truncate();
 
     if (messageId == null) {
-      await channel.query(
+      final state = await channel.query(
         messagesPagination: PaginationParams(
           limit: limit,
         ),
         preferOffline: preferOffline,
       );
       channel.state!.isUpToDate = true;
-      return null;
+      return state;
     }
 
     return channel.query(
@@ -451,7 +451,7 @@ class StreamChannelState extends State<StreamChannel> {
         return widget.child;
       },
     );
-    if (initialMessageId != null) {
+    if (_futures.length > 1) {
       child = Material(child: child);
     }
     return child;