diff --git a/lib/src/client.dart b/lib/src/client.dart
index bbf87e7..7bcb934 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -744,9 +744,6 @@ class Client {
         }
         accountData[newAccountData.type] = newAccountData;
         if (onAccountData != null) onAccountData.add(newAccountData);
-        if (newAccountData.type == 'm.tag') {
-          _sortRooms();
-        }
       }
     }
     if (sync.deviceLists != null) {
@@ -1068,7 +1065,7 @@ class Client {
           BasicRoomEvent.fromJson(eventUpdate.content);
     }
     if (rooms[j].onUpdate != null) rooms[j].onUpdate.add(rooms[j].id);
-    if (eventUpdate.type == 'timeline') _sortRooms();
+    if (['timeline', 'account_data'].contains(eventUpdate.type)) _sortRooms();
   }
 
   bool _sortLock = false;