diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 0d00b9afe5..fa183cd00e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -420,6 +420,7 @@ module.exports = React.createClass({
             this.setState({
                 room: room
             });
+            this._initTimeline(this.props);
         }
     },