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 af5502ae..ff1b8232 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -314,12 +314,22 @@ class StreamChannelState extends State<StreamChannel> {
   @override
   void initState() {
     super.initState();
+    _populateFutures();
+  }
+
+  void _populateFutures() {
     _futures = [widget.channel.initialized];
     if (initialMessageId != null) {
       _futures.add(_loadChannelAtMessage);
     }
   }
 
+  @override
+  void didUpdateWidget(covariant StreamChannel oldWidget) {
+    _populateFutures();
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   void dispose() {
     _queryTopMessagesController.close();