diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 31ac59c730..a9e16d364c 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -402,6 +402,9 @@ module.exports = React.createClass({
         q.finally(fillPromise, () => {
             this._pendingFillRequests[dir] = false;
         }).then((hasMoreResults) => {
+            if (this.unmounted) {
+                return;
+            }
             // Unpaginate once filling is complete
             this._checkUnfillState(!backwards);