diff --git a/ui/app/abilities/agent.js b/ui/app/abilities/agent.js
index 5265b5356..53450482e 100644
--- a/ui/app/abilities/agent.js
+++ b/ui/app/abilities/agent.js
@@ -8,7 +8,7 @@ export default class Client extends AbstractAbility {
 
   @computed('token.selfTokenPolicies.[]')
   get policiesIncludeAgentReadOrWrite() {
-    const policies = (this.get('token.selfTokenPolicies') || [])
+    const policies = (get(this, 'token.selfTokenPolicies') || [])
       .toArray()
       .map(policy => get(policy, 'rulesJSON.Agent.Policy'))
       .compact();
diff --git a/ui/app/components/agent-monitor.js b/ui/app/components/agent-monitor.js
index d7b16c584..8cff2581c 100644
--- a/ui/app/components/agent-monitor.js
+++ b/ui/app/components/agent-monitor.js
@@ -3,10 +3,12 @@ import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { assert } from '@ember/debug';
 import { tagName } from '@ember-decorators/component';
+import classic from 'ember-classic-decorator';
 import Log from 'nomad-ui/utils/classes/log';
 
 const LEVELS = ['error', 'warn', 'info', 'debug', 'trace'];
 
+@classic
 @tagName('')
 export default class AgentMonitor extends Component {
   @service token;
diff --git a/ui/app/controllers/clients/client/monitor.js b/ui/app/controllers/clients/client/monitor.js
index 2e0505c7b..31caafbe4 100644
--- a/ui/app/controllers/clients/client/monitor.js
+++ b/ui/app/controllers/clients/client/monitor.js
@@ -1,9 +1,6 @@
 import Controller from '@ember/controller';
-import classic from 'ember-classic-decorator';
 
-@classic
 export default class ClientMonitorController extends Controller {
-  queryParams = [{ level: 'level' }];
-
+  queryParams = ['level'];
   level = 'info';
 }
diff --git a/ui/app/controllers/servers/server/monitor.js b/ui/app/controllers/servers/server/monitor.js
index 6199fc671..38ee0eeae 100644
--- a/ui/app/controllers/servers/server/monitor.js
+++ b/ui/app/controllers/servers/server/monitor.js
@@ -1,9 +1,6 @@
 import Controller from '@ember/controller';
-import classic from 'ember-classic-decorator';
 
-@classic
 export default class ServerMonitorController extends Controller {
-  queryParams = [{ level: 'level' }];
-
+  queryParams = ['level'];
   level = 'info';
 }