diff --git a/app/routes/course.ts b/app/routes/course.ts
index e4eb3008b..4fea1bdee 100644
--- a/app/routes/course.ts
+++ b/app/routes/course.ts
@@ -134,7 +134,7 @@ export default class CourseRoute extends BaseRoute {
   }
 
   redirect(_model: ModelType, transition: Transition) {
-    if (transition.to.name === 'course.index') {
+    if (transition.to?.name === 'course.index') {
       const activeStep = this.coursePageState.stepListAsStepList.activeStep;
 
       // @ts-ignore not sure if we need to handle nullity here
diff --git a/app/routes/vote.ts b/app/routes/vote.ts
index 2be309aa0..1921eb1f1 100644
--- a/app/routes/vote.ts
+++ b/app/routes/vote.ts
@@ -26,7 +26,7 @@ export default class VoteRoute extends BaseRoute {
   }
 
   afterModel(_model: ModelType, transition: Transition) {
-    if (transition.to.name === 'vote.index') {
+    if (transition.to?.name === 'vote.index') {
       this.router.transitionTo('vote.course-ideas');
     }
   }
diff --git a/app/utils/base-route.ts b/app/utils/base-route.ts
index c63af0e22..5ab521d7d 100644
--- a/app/utils/base-route.ts
+++ b/app/utils/base-route.ts
@@ -25,13 +25,13 @@ export default class BaseRoute extends Route {
     }
 
     if (!this.allowsAnonymousAccess && !this.authenticator.isAuthenticated) {
-      const params = paramsFromRouteInfo(transition.to);
+      const params = transition.to ? paramsFromRouteInfo(transition.to) : [];
 
       if (params.length > 0) {
         const paramValues = params.map(([_, value]) => value);
-        this.authenticator.initiateLogin(this.router.urlFor(transition.to.name, ...paramValues));
+        this.authenticator.initiateLogin(this.router.urlFor(transition.to?.name || 'catalog', ...paramValues));
       } else {
-        this.authenticator.initiateLogin(this.router.urlFor(transition.to.name));
+        this.authenticator.initiateLogin(this.router.urlFor(transition.to?.name || 'catalog'));
       }
 
       transition.abort();
@@ -44,9 +44,9 @@ export default class BaseRoute extends Route {
       }
     }
 
-    const queryParams = transition.to.queryParams;
+    const queryParams = transition.to?.queryParams;
 
-    if (queryParams['r'] && /^\d[a-zA-Z][a-zA-Z]$/.test(queryParams['r'])) {
+    if (queryParams && queryParams['r'] && /^\d[a-zA-Z][a-zA-Z]$/.test(queryParams['r'])) {
       // @ts-ignore
       this.utmCampaignIdTracker.setCampaignId(queryParams['r']);
       delete queryParams['r'];
diff --git a/package-lock.json b/package-lock.json
index 8ff2fe1a9..5fe8cc2d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,11 +68,11 @@
         "@types/ember__error": "^4.0.6",
         "@types/ember__object": "^4.0.12",
         "@types/ember__polyfills": "^4.0.6",
-        "@types/ember__routing": "^4.0.21",
+        "@types/ember__routing": "^4.0.22",
         "@types/ember__runloop": "^4.0.10",
         "@types/ember__service": "^4.0.9",
         "@types/ember__string": "^3.0.15",
-        "@types/ember__template": "^4.0.6",
+        "@types/ember__template": "^4.0.7",
         "@types/ember__test": "^4.0.6",
         "@types/ember__test-helpers": "^2.9.1",
         "@types/ember__utils": "^4.0.7",
@@ -8691,9 +8691,9 @@
       "dev": true
     },
     "node_modules/@types/ember__routing": {
-      "version": "4.0.21",
-      "resolved": "https://registry.npmjs.org/@types/ember__routing/-/ember__routing-4.0.21.tgz",
-      "integrity": "sha512-eXXHDsStB77oFss+P7PoLoI4nfcD/ePQckB3taWe8wf80sVY4WnkFw990anG1A9tGCnRqRhIaEY8h3/6WP6TEw==",
+      "version": "4.0.22",
+      "resolved": "https://registry.npmjs.org/@types/ember__routing/-/ember__routing-4.0.22.tgz",
+      "integrity": "sha512-qLk9Vd2GMxdlGmX9xbzg4Farths+AQGzYDH901Wo2Nsre+Cwv1Tk1rbCiay2V3ICYZYufytdWT6V++DISF3nvw==",
       "dev": true,
       "dependencies": {
         "@types/ember": "*",
@@ -8727,9 +8727,9 @@
       "dev": true
     },
     "node_modules/@types/ember__template": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/@types/ember__template/-/ember__template-4.0.6.tgz",
-      "integrity": "sha512-s7yTfDFtdKzxwWi3zzDIlhbMETSB+eGGmvpxhl8cnw2JX8Xj5T66NRACm4q2jJ1kJfIXhECdduw5JnIyny00vw==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/@types/ember__template/-/ember__template-4.0.7.tgz",
+      "integrity": "sha512-jv4hhG+8d1zdma+jhbCdJ3Ak7C22YNatGyWWvB3N9zbXq358AAPXaJoyNY8QTDbD/RIR9P6yoRk4u9vLbF6zfA==",
       "dev": true
     },
     "node_modules/@types/ember__test": {
diff --git a/package.json b/package.json
index 335c9a96c..78db251af 100644
--- a/package.json
+++ b/package.json
@@ -74,11 +74,11 @@
     "@types/ember__error": "^4.0.6",
     "@types/ember__object": "^4.0.12",
     "@types/ember__polyfills": "^4.0.6",
-    "@types/ember__routing": "^4.0.21",
+    "@types/ember__routing": "^4.0.22",
     "@types/ember__runloop": "^4.0.10",
     "@types/ember__service": "^4.0.9",
     "@types/ember__string": "^3.0.15",
-    "@types/ember__template": "^4.0.6",
+    "@types/ember__template": "^4.0.7",
     "@types/ember__test": "^4.0.6",
     "@types/ember__test-helpers": "^2.9.1",
     "@types/ember__utils": "^4.0.7",