diff --git a/lib/models/room.js b/lib/models/room.js
index 59d94d556..5b002613e 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -208,9 +208,11 @@ Room.prototype.getAvatarUrl = function(baseUrl, width, height, resizeMethod,
  * @return {boolean} True if this user_id has the given membership state.
  */
  Room.prototype.hasMembershipState = function(userId, membership) {
-    return utils.filter(this.currentState.getMembers(), function(m) {
-        return m.membership === membership && m.userId === userId;
-    }).length > 0;
+    var member = this.getMember(userId);
+    if (!member) {
+        return false;
+    }
+    return member.membership === membership;
  };
 
 /**