diff --git a/src/components/views/avatars/GroupAvatar.js b/src/components/views/avatars/GroupAvatar.js
index 4f34cc2c16..5a18213eec 100644
--- a/src/components/views/avatars/GroupAvatar.js
+++ b/src/components/views/avatars/GroupAvatar.js
@@ -54,11 +54,11 @@ export default React.createClass({
         // extract the props we use from props so we can pass any others through
         // should consider adding this as a global rule in js-sdk?
         /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
-        const {groupId, groupAvatarUrl, ...otherProps} = this.props;
+        const {groupId, groupAvatarUrl, groupName, ...otherProps} = this.props;
 
         return (
             <BaseAvatar
-                name={this.props.groupName || this.props.groupId[1]}
+                name={groupName || this.props.groupId[1]}
                 idName={this.props.groupId}
                 url={this.getGroupAvatarUrl()}
                 {...otherProps}
diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index be9de849e9..5374094f1f 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -29,18 +29,20 @@ function getDisplayAliasForRoom(room) {
 }
 
 const RoomDetailRow = React.createClass({
-    propTypes: PropTypes.shape({
-        name: PropTypes.string,
-        topic: PropTypes.string,
-        roomId: PropTypes.string,
-        avatarUrl: PropTypes.string,
-        numJoinedMembers: PropTypes.number,
-        canonicalAlias: PropTypes.string,
-        aliases: PropTypes.arrayOf(PropTypes.string),
+    propTypes: {
+        room: PropTypes.shape({
+            name: PropTypes.string,
+            topic: PropTypes.string,
+            roomId: PropTypes.string,
+            avatarUrl: PropTypes.string,
+            numJoinedMembers: PropTypes.number,
+            canonicalAlias: PropTypes.string,
+            aliases: PropTypes.arrayOf(PropTypes.string),
 
-        worldReadable: PropTypes.bool,
-        guestCanJoin: PropTypes.bool,
-    }),
+            worldReadable: PropTypes.bool,
+            guestCanJoin: PropTypes.bool,
+        }),
+    },
 
     onClick: function(ev) {
         ev.preventDefault();