diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js
index 4adeaf2e2c..950f2e10b4 100644
--- a/src/controllers/organisms/RoomList.js
+++ b/src/controllers/organisms/RoomList.js
@@ -96,7 +96,14 @@ module.exports = {
     },
 
     getRoomList: function() {
-        return RoomListSorter.mostRecentActivityFirst(MatrixClientPeg.get().getRooms());
+        return RoomListSorter.mostRecentActivityFirst(
+            MatrixClientPeg.get().getRooms().filter(function(room) {
+                return room.hasMembershipState(
+                    MatrixClientPeg.get().credentials.userId,
+                    "join"
+                );
+            })
+        );
     },
 
     makeRoomTiles: function() {