diff --git a/ui/core/app/controllers/orgs/org/roles/role.js b/ui/core/app/controllers/orgs/org/roles/role.js
index 7a5564ac0..85022f933 100644
--- a/ui/core/app/controllers/orgs/org/roles/role.js
+++ b/ui/core/app/controllers/orgs/org/roles/role.js
@@ -1,18 +1,12 @@
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
 
 export default class OrgsOrgRolesRoleController extends Controller {
-  // =services
-
-  @service intl;
-
   // =attributes
 
   /**
    * @type {string}
    */
-  get breadCrumb() {
-    return this.intl.t('resources.role');
-  }
+  @alias('model.name') breadCrumb;
 
 }
diff --git a/ui/core/app/routes/orgs/org/roles.js b/ui/core/app/routes/orgs/org/roles.js
index db9c53d1b..807c2aeee 100644
--- a/ui/core/app/routes/orgs/org/roles.js
+++ b/ui/core/app/routes/orgs/org/roles.js
@@ -8,11 +8,7 @@ export default class OrgsOrgRolesRoute extends Route {
    * @return {Promise[RoleModel]}
    */
   model() {
-    return this.store.findAll('role').catch(() => {
-      // FIX ME: API response of "{}" generates following error:
-      // Error while processing route: orgs.org.roles.index
-      // Error: Assertion Failed: You made a 'findAll' request for 'role' records, but the adapter's response did not have any data
-    });
+    return this.store.findAll('role');
   }
-  
+
 }