diff --git a/app/router.js b/app/router.js
index 4507c0c42e8..6383169b40c 100644
--- a/app/router.js
+++ b/app/router.js
@@ -1,8 +1,8 @@
-import RouterScroll from 'ember-router-scroll';
+import EmberRouter from '@ember/routing/router';
 
 import config from './config/environment';
 
-export default class Router extends RouterScroll {
+export default class Router extends EmberRouter {
   location = config.locationType;
   rootURL = config.rootURL;
 }
diff --git a/package.json b/package.json
index a07d9f232c7..712fa439f0b 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "ember-promise-helpers": "1.0.9",
     "ember-qunit": "4.6.0",
     "ember-resolver": "8.0.2",
-    "ember-router-scroll": "3.3.7",
+    "ember-router-scroll": "4.0.1",
     "ember-set-body-class": "1.0.2",
     "ember-source": "3.24.1",
     "ember-svg-jar": "2.2.3",
diff --git a/yarn.lock b/yarn.lock
index 734afcdf21e..b3e08c2a066 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7004,10 +7004,10 @@ ember-router-generator@^2.0.0:
     "@babel/traverse" "^7.4.5"
     recast "^0.18.1"
 
-ember-router-scroll@3.3.7:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-3.3.7.tgz#b272f846855bbd915e2259455bbbe1890e7e8dce"
-  integrity sha512-WPzgMv7+6Bi8ShwNngWev7aqrJxWf9VoDknAzUOCSS6Zvt9fBmu0rQF2eUhSTSbgjAmAEdiiBVY7Rhx6RXgeIg==
+ember-router-scroll@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ember-router-scroll/-/ember-router-scroll-4.0.1.tgz#90fd32b592972ad9abb56a6537b54d07ddbd1501"
+  integrity sha512-x5PYqexkMsgibqoz4gQ19kbjIGseEyIdxoBtJBzl6nsntY+HLO3V0MbFA+r6vHjH5v6c7g/XMT2LRm2UMObxqA==
   dependencies:
     ember-app-scheduler "^5.1.1"
     ember-cli-babel "^7.11.1"