diff --git a/app/router.ts b/app/router.ts
index 40005332..58d5bdff 100644
--- a/app/router.ts
+++ b/app/router.ts
@@ -1,9 +1,8 @@
-import EmberRouter from '@ember/routing/router';
-
 import { addDocfyRoutes } from '@docfy/ember';
+import EmbroiderRouter from '@embroider/router';
 import config from 'ember-cheat-sheet/config/environment';
 
-export default class Router extends EmberRouter {
+export default class Router extends EmbroiderRouter {
   location = config.locationType;
   rootURL = config.rootURL;
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 184ccc73..38146b92 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -20,7 +20,7 @@ module.exports = function (defaults) {
     staticAddonTestSupportTrees: true,
     staticHelpers: true,
     staticComponents: true,
-    // splitAtRoutes: ['docs', 'docs.templates'],
+    splitAtRoutes: [/docs/],
     packagerOptions: {
       webpackConfig: {
         module: {
diff --git a/package.json b/package.json
index 335f7bde..77871bf5 100644
--- a/package.json
+++ b/package.json
@@ -130,6 +130,7 @@
     "yarn": "1.22.11"
   },
   "dependencies": {
+    "@embroider/router": "^0.44.1",
     "highlight.js": "^11.2.0",
     "highlightjs-glimmer": "^1.4.0",
     "remark-autolink-headings": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5d7aca80..542ef729 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2409,6 +2409,15 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/router@^0.44.1":
+  version "0.44.1"
+  resolved "https://registry.npmjs.org/@embroider/router/-/router-0.44.1.tgz#58ff3413812812756f746e6b6e110a1f40040a62"
+  integrity sha512-4EKlg9FYL8KRJLhfnwr4aLL6vMhUJ1LviNE4QlKGU70LRahOhg9UMwqhA1PSCfoQ91LbmnTTnw4vIvasZWzRdA==
+  dependencies:
+    "@ember/test-waiters" "^3.0.0"
+    "@embroider/macros" "0.44.1"
+    ember-cli-babel "^7.23.0"
+
 "@embroider/shared-internals@0.41.0":
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.41.0.tgz#2553f026d4f48ea1fd11235501feb63bf49fa306"