diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index b64cfc69cc..9a132a73f5 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -64,6 +64,8 @@ module.exports = React.createClass({
     },
 
     _recalculateState: function() {
+        if (!this.props.room) return;
+        
         var topic = this.props.room.currentState.getStateEvents('m.room.topic', '');
         var name = this.props.room.currentState.getStateEvents('m.room.name', '');