diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
index 70e6df11..daffadfe 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
@@ -44,7 +44,8 @@ class MessageSearchBlocState extends State<MessageSearchBloc>
   late StreamChatCoreState _streamChatCoreState;
 
   /// The current messages list
-  List<GetMessageResponse>? get messageResponses => _messageResponses.value;
+  List<GetMessageResponse>? get messageResponses =>
+      _messageResponses.valueOrNull;
 
   /// The current messages list as a stream
   Stream<List<GetMessageResponse>> get messagesStream =>
diff --git a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
index 0c0d46cd..1806ec36 100644
--- a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
@@ -43,7 +43,7 @@ class UsersBloc extends StatefulWidget {
 class UsersBlocState extends State<UsersBloc>
     with AutomaticKeepAliveClientMixin {
   /// The current users list
-  List<User>? get users => _usersController.value;
+  List<User>? get users => _usersController.valueOrNull;
 
   /// The current users list as a stream
   Stream<List<User>> get usersStream => _usersController.stream;