diff --git a/ui/admin/app/routes/scopes/scope/authenticate.js b/ui/admin/app/routes/scopes/scope/authenticate.js
index a21edbc2a..cc83000e2 100644
--- a/ui/admin/app/routes/scopes/scope/authenticate.js
+++ b/ui/admin/app/routes/scopes/scope/authenticate.js
@@ -52,7 +52,8 @@ export default class ScopesScopeAuthenticateRoute extends Route {
     // and filter out any that have no auth methods
     const scopes = this.modelFor('scopes').filter(
       ({ id: scope_id, isOrg }) =>
-        isOrg && authMethodsForAllScopes.filterBy('scopeID', scope_id).length
+        isOrg &&
+        authMethodsForAllScopes.filter((i) => i.scopeID === scope_id).length
     );
     return hash({
       scope: this.modelFor('scopes.scope'),
diff --git a/ui/admin/app/routes/scopes/scope/index.js b/ui/admin/app/routes/scopes/scope/index.js
index 36dfb520d..4026928c1 100644
--- a/ui/admin/app/routes/scopes/scope/index.js
+++ b/ui/admin/app/routes/scopes/scope/index.js
@@ -23,8 +23,9 @@ export default class ScopesScopeIndexRoute extends Route {
    * If authenticated but no orgs exist, redirect into onboarding.
    */
   redirect(model) {
-    const hasOrgs = this.store.peekAll('scope').filterBy('type', 'org').length;
-
+    const hasOrgs = this.store
+      .peekAll('scope')
+      .filter((scope) => scope.type === 'org').length;
     // Must authenticate before proceeding anywhere else
     if (!this.session.isAuthenticated) {
       return this.router.transitionTo('scopes.scope.authenticate');