diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 805749b1cd..51fee851f3 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -627,7 +627,7 @@ module.exports = React.createClass({
     _onHeightChanged: function() {
         const scrollPanel = this.refs.scrollPanel;
         if (scrollPanel) {
-            scrollPanel.forceUpdate();
+            scrollPanel.checkScroll();
         }
     },