diff --git a/packages/stream_chat_persistence/lib/src/dao/message_dao.dart b/packages/stream_chat_persistence/lib/src/dao/message_dao.dart
index 01e5c889..204daaed 100644
--- a/packages/stream_chat_persistence/lib/src/dao/message_dao.dart
+++ b/packages/stream_chat_persistence/lib/src/dao/message_dao.dart
@@ -102,7 +102,7 @@ class MessageDao extends DatabaseAccessor<MoorChatDatabase>
         .map(_messageFromJoinRow)
         .get());
 
-    if (options?.lessThan != null) {
+    if (options?.lessThan != null && msgList.isNotEmpty) {
       final lessThanIndex = msgList.indexWhere((m) => m.id == options.lessThan);
       msgList.removeRange(lessThanIndex, msgList.length);
     }