diff --git a/lib/src/client.dart b/lib/src/client.dart
index f856d334..0c2228c0 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1255,7 +1255,6 @@ class Client extends MatrixApi {
           () async => await _currentTransaction,
           syncResp.itemCount,
         );
-        _sortRooms();
         onSyncStatus.add(SyncStatusUpdate(SyncStatus.cleaningUp));
       } else {
         await _handleSync(syncResp);
@@ -1349,6 +1348,7 @@ class Client extends MatrixApi {
       encryption?.handleDeviceOneTimeKeysCount(
           sync.deviceOneTimeKeysCount, sync.deviceUnusedFallbackKeyTypes);
     }
+    _sortRooms();
     onSync.add(sync);
   }