diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 9d559ed4a4..8fbe4334c8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -387,8 +387,8 @@ var TimelinePanel = React.createClass({
         });
     },
 
-    onRoomTimelineReset: function(room) {
-        if (room !== this.props.timelineSet.room) return;
+    onRoomTimelineReset: function(room, timelineSet) {
+        if (timelineSet !== this.props.timelineSet) return;
 
         if (this.refs.messagePanel && this.refs.messagePanel.isAtBottom()) {
             this._loadTimeline();