diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index dedd715f9c..240a5b2efe 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -127,8 +127,9 @@ module.exports = React.createClass({
     },
 
     _initGroupStore(groupId) {
+        if (!groupId) return;
         this._groupStore = GroupStoreCache.getGroupStore(
-            this.context.matrixClient, this.props.groupId,
+            this.context.matrixClient, groupId,
         );
         this._groupStore.registerListener(this.onGroupStoreUpdated);
     },