diff --git a/packages/stream_chat_flutter_core/lib/src/better_stream_builder.dart b/packages/stream_chat_flutter_core/lib/src/better_stream_builder.dart
index a51c0762..ddf342dc 100644
--- a/packages/stream_chat_flutter_core/lib/src/better_stream_builder.dart
+++ b/packages/stream_chat_flutter_core/lib/src/better_stream_builder.dart
@@ -57,18 +57,14 @@ class _BetterStreamBuilderState<T> extends State<BetterStreamBuilder<T>> {
     return widget.builder(context, _lastEvent ?? widget.initialData);
   }
 
-  bool _firstTime = true;
   @override
-  void didChangeDependencies() {
-    if (_firstTime) {
-      _lastEvent = widget.initialData;
-      _subscription = widget.stream?.listen(
-        _onEvent,
-        onError: _onError,
-      );
-      _firstTime = false;
-    }
-    super.didChangeDependencies();
+  void initState() {
+    _lastEvent = widget.initialData;
+    _subscription = widget.stream?.listen(
+      _onEvent,
+      onError: _onError,
+    );
+    super.initState();
   }
 
   @override