diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index dcb25eff61..2bb6caddb7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -86,7 +86,7 @@ module.exports = React.createClass({
         var userIds = [];
         // for .. in optimisation to return early if there are >2 keys
         for (var uid in mlist) {
-            if (mlist.hasOwnProperty(uid)) {
+            if (mlist.hasOwnProperty(uid) && ["join", "invite"].includes(mlist[uid].membership)) {
                 userIds.push(uid);
             }
             if (userIds.length > 2) {