diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 81699af3333..a8c419b5b6b 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -44,6 +44,10 @@ const Discourse = Application.extend({
       Error.stackTraceLimit = Infinity;
     }
 
+    // Our scroll-manager service takes care of storing and restoring scroll position.
+    // Disable browser handling:
+    window.history.scrollRestoration = "manual";
+
     loadInitializers(this);
   },