diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a65cac1..8b3bce00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [0.20.1] - 5th May 2023
+- fix: cast issues in getEventList (td)
+- refactor: Make parameters more clear and remove unused methods (Krille)
+- fix: Only request users which are valid mxid (Krille)
+- fix: Always wait for account data to load before returning SSSS status (Nicolas Werner)
+- fix: Reactions are sent encrypted (Krille)
+- chore: oneShotSync before staleCallChecker (td)
+- fix: updateMuteStatus after kConnected (td)
+
 ## [0.20.0] - 28th April 2023
 
 - refactor: Make optional eventId a named parameter (Krille)
diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
index 1234c5c1..b3dd839c 100644
--- a/lib/src/database/hive_collections_database.dart
+++ b/lib/src/database/hive_collections_database.dart
@@ -402,13 +402,12 @@ class HiveCollectionsDatabase extends DatabaseApi {
         // Combine those two lists while respecting the start and limit parameters.
         final end = min(timelineEventIds.length,
             start + (limit ?? timelineEventIds.length));
-        final eventIds = <String>[
+        final eventIds = List<String>.from([
           ...sendingEventIds,
           ...(start < timelineEventIds.length && !onlySending
-                  ? timelineEventIds.getRange(start, end).toList()
-                  : [])
-              .whereType<String>()
-        ];
+              ? timelineEventIds.getRange(start, end).toList()
+              : [])
+        ]);
 
         return await _getEventsByIds(eventIds, room);
       });
diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 05bcaf9c..6135700a 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -408,12 +408,16 @@ 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 +
-            (start < timelineEventIds.length && !onlySending
+        final eventIds = List<String>.from(
+          [
+            ...sendingEventIds,
+            ...(start < timelineEventIds.length && !onlySending
                 ? timelineEventIds.getRange(start, end).toList()
-                : []);
+                : [])
+          ],
+        );
 
-        return await _getEventsByIds(eventIds.cast<String>(), room);
+        return await _getEventsByIds(eventIds, room);
       });
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 6c0cfe82..303ea384 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: matrix
 description: Matrix Dart SDK
-version: 0.20.0
+version: 0.20.1
 homepage: https://famedly.com
 repository: https://gitlab.com/famedly/company/frontend/famedlysdk.git