diff --git a/lib/src/database/matrix_sdk_database.dart b/lib/src/database/matrix_sdk_database.dart index c8509a73..8cb0e583 100644 --- a/lib/src/database/matrix_sdk_database.dart +++ b/lib/src/database/matrix_sdk_database.dart @@ -1585,7 +1585,12 @@ class MatrixSdkDatabase extends DatabaseApi { } // Combine those two lists while respecting the start and limit parameters. - final eventIds = sendingEventIds + timelineEventIds; + // Create a new list object instead of concatonating list to prevent + // random type errors. + final eventIds = [ + ...sendingEventIds, + ...timelineEventIds, + ]; if (limit != null && eventIds.length > limit) { eventIds.removeRange(limit, eventIds.length); }