diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 202d29c021..886bd2b706 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -174,6 +174,8 @@ var TimelinePanel = React.createClass({
         this.setState({[statekey]: true});
 
         return this._timelineWindow.paginate(dir, PAGINATE_SIZE).then((r) => {
+            if (this.unmounted) { return; }
+
             debuglog("TimelinePanel: paginate complete backwards:"+backwards+"; success:"+r);
             this.setState({[statekey]: false});
             this._onTimelineUpdated(r);