diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 514937f877..fd8befea01 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -418,7 +418,9 @@ module.exports = React.createClass({
         var scrollState = this.scrollState;
         var scrollNode = this._getScrollNode();
 
-        if (scrollState.stuckAtBottom) {
+        // XXX: DISABLE SCROLL TO TOKEN ENTIRELY TEMPORARILY AS IT'S SCREWING
+        // UP MY DEMO - see https://github.com/vector-im/vector-web/issues/946
+        if (true || scrollState.stuckAtBottom) {
             scrollNode.scrollTop = scrollNode.scrollHeight;
             debuglog("Scrolled to bottom; offset now", scrollNode.scrollTop);
         } else if (scrollState.trackedScrollToken) {