diff --git a/ui/app/routes/access-control.js b/ui/app/routes/access-control.js
index 260cd226e20..9dc06836df1 100644
--- a/ui/app/routes/access-control.js
+++ b/ui/app/routes/access-control.js
@@ -7,7 +7,6 @@ import Route from '@ember/routing/route';
 import withForbiddenState from 'nomad-ui/mixins/with-forbidden-state';
 import WithModelErrorHandling from 'nomad-ui/mixins/with-model-error-handling';
 import { inject as service } from '@ember/service';
-import RSVP from 'rsvp';
 
 export default class AccessControlRoute extends Route.extend(
   withForbiddenState,
@@ -29,11 +28,14 @@ export default class AccessControlRoute extends Route.extend(
 
   // Load our tokens, roles, and policies
   async model() {
-    return RSVP.hash({
-      policies: await this.store.findAll('policy'),
-      tokens: await this.store.findAll('token'),
-      roles: await this.store.findAll('role'),
-    });
+    const policies = await this.store.findAll('policy');
+    const roles = await this.store.findAll('role');
+    const tokens = await this.store.findAll('token');
+    return {
+      policies,
+      roles,
+      tokens,
+    };
   }
 
   // After model: check for all tokens[].policies and roles[].policies to see if any of them are listed