diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 25cccd2dd8..a1a7d08e0b 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -215,7 +215,9 @@ module.exports = React.createClass({
             // this might cause the scrollbar to resize in case the max-height was not correct
             // but that's better than ending up with a lot of whitespace at the bottom of the timeline.
             // we need to above check because when showing the typing notifs, an onScroll event is also triggered
-            this.clearBlockShrinking();
+            if (!this.isAtBottom()) {
+                this.clearBlockShrinking();
+            }
 
             this._saveScrollState();
         } else {