diff --git a/lib/src/client.dart b/lib/src/client.dart
index 708c4f9..ae3182a 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1216,14 +1216,14 @@ class Client {
         prev_batch: prev_batch,
         summary: summary,
       );
+      if (database != null) {
+        await database.storeRoomUpdate(this.id, update, getRoomById(id));
+      }
       _updateRoomsByRoomUpdate(update);
       final roomObj = getRoomById(id);
       if (limitedTimeline && roomObj != null) {
         roomObj.resetSortOrder();
       }
-      if (database != null) {
-        await database.storeRoomUpdate(this.id, update, getRoomById(id));
-      }
       onRoomUpdate.add(update);
 
       var handledEvents = false;