diff --git a/lib/src/room.dart b/lib/src/room.dart
index 2ddba1fd..9f7d42bf 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1158,16 +1158,15 @@ class Room {
         Membership.invite,
         Membership.knock,
       ]]) {
-    final userList = <User>[];
     final members = states[EventTypes.RoomMember];
     if (members != null) {
-      for (final entry in members.entries) {
-        final state = entry.value;
-        if (state.type == EventTypes.RoomMember) userList.add(state.asUser);
-      }
+      return members.entries
+          .where((entry) => entry.value.type == EventTypes.RoomMember)
+          .map((entry) => entry.value.asUser)
+          .where((user) => membershipFilter.contains(user.membership))
+          .toList();
     }
-    userList.removeWhere((u) => !membershipFilter.contains(u.membership));
-    return userList;
+    return <User>[];
   }
 
   bool _requestedParticipants = false;