diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js
index 054e5f4e1e..423197067c 100644
--- a/src/controllers/organisms/RoomList.js
+++ b/src/controllers/organisms/RoomList.js
@@ -98,10 +98,8 @@ module.exports = {
     getRoomList: function() {
         return RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms().filter(function(room) {
-                return room.hasMembershipState(
-                    MatrixClientPeg.get().credentials.userId,
-                    "join"
-                );
+                var member = room.getMember(MatrixClientPeg.get().credentials.userId);
+                return member && (member.membership == "join" || member.membership == "invite");
             })
         );
     },