diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 3d204be510..4311f683df 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -265,7 +265,11 @@ var TimelinePanel = React.createClass({
         if (count > 0) {
             debuglog("TimelinePanel: Unpaginating", count, "in direction", dir);
             this._timelineWindow.unpaginate(count, backwards);
+
+            // We can now paginate in the unpaginated direction
+            const canPaginateKey = (backwards) ? 'canBackPaginate' : 'canForwardPaginate';
             this.setState({
+                [canPaginateKey]: true,
                 events: this._getEvents(),
             });
         }