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 ff1b8232..c2333b05 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -326,7 +326,9 @@ class StreamChannelState extends State<StreamChannel> {
 
   @override
   void didUpdateWidget(covariant StreamChannel oldWidget) {
-    _populateFutures();
+    if (oldWidget.initialMessageId != initialMessageId) {
+      _populateFutures();
+    }
     super.didUpdateWidget(oldWidget);
   }