diff --git a/lib/src/client.dart b/lib/src/client.dart
index c00c6fd0..4dbbb3dd 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1430,10 +1430,10 @@ class Client extends MatrixApi {
           room.setState(user);
         }
       }
+      _updateRoomsByEventUpdate(update);
       if (type != EventUpdateType.ephemeral && database != null) {
         await database.storeEventUpdate(update);
       }
-      _updateRoomsByEventUpdate(update);
       if (encryptionEnabled) {
         await encryption.handleEventUpdate(update);
       }