diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart index c5202c66..88101ac6 100644 --- a/lib/src/database/hive_database.dart +++ b/lib/src/database/hive_database.dart @@ -389,8 +389,10 @@ class FamedlySdkHiveDatabase extends DatabaseApi { // Combine those two lists while respecting the start and limit parameters. final end = min( timelineEventIds.length, start + (limit ?? timelineEventIds.length)); - final eventIds = - sendingEventIds + timelineEventIds.getRange(start, end).toList(); + final eventIds = sendingEventIds + + (start < timelineEventIds.length + ? timelineEventIds.getRange(start, end).toList() + : []); return await _getEventsByIds(eventIds.cast(), room); }