diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8192f472dc..4924c06320 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1100,7 +1100,7 @@ module.exports = React.createClass({
                 <div className="mx_MatrixChat_wrapper">
                     {topBar}
                     <div className={bodyClasses}>
-                        <LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs} opacity={this.state.sideOpacity}/>
+                        <LeftPanel selectedRoom={this.state.currentRoomId} collapsed={this.state.collapse_lhs || false} opacity={this.state.sideOpacity}/>
                         <main className="mx_MatrixChat_middlePanel">
                             {page_element}
                         </main>
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 8e57ceab9b..8967bdeafb 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -33,7 +33,7 @@ module.exports = React.createClass({
 
     propTypes: {
         ConferenceHandler: React.PropTypes.any,
-        collapsed: React.PropTypes.bool,
+        collapsed: React.PropTypes.bool.isRequired,
         currentRoom: React.PropTypes.string,
         searchFilter: React.PropTypes.string,
     },