diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index 424d4bcf..64acae98 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -39,6 +39,7 @@ class StreamChat extends StatefulWidget {
     this.streamChatThemeData,
     this.onBackgroundEventReceived,
     this.backgroundKeepAlive = const Duration(minutes: 1),
+    this.connectivityStream,
   }) : super(key: key);
 
   /// Client to do chat ops with
@@ -59,6 +60,11 @@ class StreamChat extends StatefulWidget {
   /// upon the [Event.type]
   final EventHandler? onBackgroundEventReceived;
 
+  /// Stream of connectivity result
+  /// Visible for testing
+  @visibleForTesting
+  final Stream<ConnectivityResult>? connectivityStream;
+
   @override
   StreamChatState createState() => StreamChatState();
 
@@ -102,6 +108,7 @@ class StreamChatState extends State<StreamChat> {
                 client: client,
                 onBackgroundEventReceived: widget.onBackgroundEventReceived,
                 backgroundKeepAlive: widget.backgroundKeepAlive,
+                connectivityStream: widget.connectivityStream,
                 child: widget.child ?? const Offstage(),
               ),
             );
diff --git a/packages/stream_chat_flutter/test/src/deleted_message_test.dart b/packages/stream_chat_flutter/test/src/deleted_message_test.dart
index bcf9cf62..206d92e3 100644
--- a/packages/stream_chat_flutter/test/src/deleted_message_test.dart
+++ b/packages/stream_chat_flutter/test/src/deleted_message_test.dart
@@ -79,6 +79,7 @@ void main() {
                 ),
               ),
             ),
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -131,6 +132,7 @@ void main() {
                 ),
               ),
             ),
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -187,6 +189,7 @@ void main() {
                 ),
               ),
             ),
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
diff --git a/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart b/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
index 770a040b..c5183f35 100644
--- a/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
+++ b/packages/stream_chat_flutter/test/src/reaction_bubble_test.dart
@@ -60,6 +60,7 @@ void main() {
               maskColor: theme.ownMessageTheme.reactionsMaskColor!,
             ),
           ),
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
         ),
         surfaceSize: const Size(100, 100),
       );
@@ -96,6 +97,7 @@ void main() {
               maskColor: theme.ownMessageTheme.reactionsMaskColor!,
             ),
           ),
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
         ),
         surfaceSize: const Size(100, 100),
       );
@@ -118,6 +120,7 @@ void main() {
         StreamChat(
           client: client,
           streamChatThemeData: StreamChatThemeData.fromTheme(themeData),
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
           child: Container(
             color: Colors.black,
             child: ReactionBubble(
@@ -162,6 +165,7 @@ void main() {
         StreamChat(
           client: client,
           streamChatThemeData: StreamChatThemeData.fromTheme(themeData),
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
           child: Container(
             color: Colors.black,
             child: ReactionBubble(
@@ -204,6 +208,7 @@ void main() {
       await tester.pumpWidgetBuilder(
         StreamChat(
           client: client,
+          connectivityStream: Stream.value(ConnectivityResult.mobile),
           streamChatThemeData: StreamChatThemeData.fromTheme(themeData),
           child: SizedBox(
             child: ReactionBubble(
diff --git a/packages/stream_chat_flutter/test/src/system_message_test.dart b/packages/stream_chat_flutter/test/src/system_message_test.dart
index 8fa3ad44..6bb1da43 100644
--- a/packages/stream_chat_flutter/test/src/system_message_test.dart
+++ b/packages/stream_chat_flutter/test/src/system_message_test.dart
@@ -100,6 +100,7 @@ void main() {
                 ),
               ),
             ),
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
@@ -151,6 +152,7 @@ void main() {
                 ),
               ),
             ),
+            connectivityStream: Stream.value(ConnectivityResult.mobile),
           ),
         ),
         surfaceSize: const Size.square(200),
diff --git a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart
index 01463de0..ef947a0f 100644
--- a/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart
+++ b/packages/stream_chat_flutter_core/lib/stream_chat_flutter_core.dart
@@ -1,5 +1,6 @@
 library stream_chat_flutter_core;
 
+export 'package:connectivity_plus/connectivity_plus.dart';
 export 'package:stream_chat/stream_chat.dart';
 
 export 'src/channel_list_core.dart' hide ChannelListCoreState;
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 7bae31f9..4292772b 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -11,16 +11,16 @@ environment:
 
 dependencies:
   collection: ^1.15.0
+  connectivity_plus: ^1.0.1
   flutter:
     sdk: flutter
   meta: ^1.3.0
   rxdart: ^0.27.0
   stream_chat: ^2.0.0-nullsafety.2
-  connectivity_plus: ^1.0.1
 
 dev_dependencies:
   fake_async: ^1.2.0
   flutter_test:
     sdk: flutter
-  mocktail: ^0.1.1
+  mocktail: ^0.1.3