diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 338ca6c1c5..51a1081615 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -23,7 +23,7 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
 var dis = require("../../dispatcher");
 
 /*
- * Component which shows the filtered file using a TimelinePanel
+ * Component which shows the global notification list using a TimelinePanel
  */
 var NotificationPanel = React.createClass({
     displayName: 'NotificationPanel',
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8d2d2631fe..37af891db0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1570,7 +1570,7 @@ module.exports = React.createClass({
 
         var messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
-                timelineSet={this.state.room.getTimelineSets()[0]}
+                timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 manageReadReceipts={true}
                 manageReadMarkers={true}
                 hidden={hideMessagePanel}