diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js
index 1cf0bf276e..1fd8c4d207 100644
--- a/src/skins/vector/views/organisms/MemberList.js
+++ b/src/skins/vector/views/organisms/MemberList.js
@@ -35,9 +35,13 @@ module.exports = React.createClass({
     makeMemberTiles: function() {
         var MemberTile = sdk.getComponent("molecules.MemberTile");
 
+        if (!self.memberDict) {
+            return null;
+        }
+
         var self = this;
-        return Object.keys(self.state.memberDict).map(function(userId) {
-            var m = self.state.memberDict[userId];
+        return Object.keys(self.memberDict).map(function(userId) {
+            var m = self.memberDict[userId];
             return (
                 <MemberTile key={userId} member={m} ref={userId} />
             );