diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 127fe2fdb8..56dd41d929 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -358,7 +358,9 @@ module.exports = React.createClass({
         // pagination request, so give the messagePanel a chance to set off
         // another.
 
-        this.refs.messagePanel.checkFillState();
+        if (this.refs.messagePanel) {
+            this.refs.messagePanel.checkFillState();
+        }
     },
 
     onSearchResultsFillRequest: function(backwards) {