diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 129cbd4581..2a11271232 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -170,6 +170,10 @@ module.exports = React.createClass({
             this._saveScrollState();
         } else {
             debuglog("Ignoring scroll echo");
+
+            // only ignore the echo once, otherwise we'll get confused when the
+            // user scrolls away from, and back to, the autoscroll point.
+            this._lastSetScroll = undefined;
         }
 
         this.props.onScroll(ev);