diff --git a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
index 6687eef5..1aed7198 100644
--- a/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/channels_bloc.dart
@@ -105,7 +105,8 @@ class ChannelsBlocState extends State<ChannelsBloc>
   }) async {
     final client = _streamChatCoreState!.client;
 
-    final clear = paginationParams.offset == 0;
+    final offset = paginationParams.offset;
+    final clear = offset == null || offset == 0;
     if (clear && _paginationEnded) {
       _paginationEnded = false;
     }
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 e7916478..f2ec10d9 100644
--- a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
@@ -75,7 +75,9 @@ class UsersBlocState extends State<UsersBloc>
     }
 
     try {
-      final clear = pagination == null || pagination.offset == 0;
+      final clear = pagination == null ||
+          pagination.offset == null ||
+          pagination.offset == 0;
 
       final oldUsers = List<User>.from(users ?? []);
 
diff --git a/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart b/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
index 979ca5b2..3e56ca76 100644
--- a/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
+++ b/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
@@ -74,7 +74,10 @@ void main() {
             messageFilters: any(named: 'messageFilters'),
             paginationParams: any(named: 'paginationParams'),
           )).thenAnswer(
-        (_) async => SearchMessagesResponse()..results = messageResponseList,
+        (_) async => SearchMessagesResponse()
+          ..results = messageResponseList
+          ..next = null
+          ..previous = null,
       );
 
       messageSearchBlocState.search(filter: testFilter);
@@ -177,7 +180,10 @@ void main() {
             messageFilters: any(named: 'messageFilters'),
             paginationParams: any(named: 'paginationParams'),
           )).thenAnswer(
-        (_) async => SearchMessagesResponse()..results = messageResponseList,
+        (_) async => SearchMessagesResponse()
+          ..results = messageResponseList
+          ..next = null
+          ..previous = null,
       );
 
       messageSearchBlocState.search(filter: testFilter);
@@ -206,8 +212,10 @@ void main() {
             messageFilters: any(named: 'messageFilters'),
             paginationParams: pagination,
           )).thenAnswer(
-        (_) async =>
-            SearchMessagesResponse()..results = paginatedMessageResponseList,
+        (_) async => SearchMessagesResponse()
+          ..results = paginatedMessageResponseList
+          ..next = null
+          ..previous = null,
       );
 
       messageSearchBlocState.search(pagination: pagination, filter: testFilter);
@@ -269,7 +277,10 @@ void main() {
             messageFilters: any(named: 'messageFilters'),
             paginationParams: any(named: 'paginationParams'),
           )).thenAnswer(
-        (_) async => SearchMessagesResponse()..results = messageResponseList,
+        (_) async => SearchMessagesResponse()
+          ..results = messageResponseList
+          ..next = null
+          ..previous = null,
       );
 
       messageSearchBlocState.search(filter: testFilter);