diff --git a/ui/packages/consul-ui/app/modifiers/did-upsert.js b/ui/packages/consul-ui/app/modifiers/did-upsert.js
index 7a3330497f..443e67d3df 100644
--- a/ui/packages/consul-ui/app/modifiers/did-upsert.js
+++ b/ui/packages/consul-ui/app/modifiers/did-upsert.js
@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-import { setModifierManager, capabilities } from '@ember/modifier';
-import { gte } from 'ember-compatibility-helpers';
+import Modifier from 'ember-modifier';
 
 const createEventLike = (state) => {
   return {
@@ -12,40 +11,11 @@ const createEventLike = (state) => {
     currentTarget: state.element,
   };
 };
-export default setModifierManager(
-  () => ({
-    capabilities: capabilities(gte('3.22.0') ? '3.22' : '3.13', { disableAutoTracking: true }),
 
-    createModifier() {
-      return { element: null };
-    },
-
-    installModifier(state, element, args) {
-      state.element = element;
-      if (gte('3.22.0')) {
-        // Consume individual properties to entangle tracking.
-        // https://github.com/emberjs/ember.js/issues/19277
-        // https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
-        args.positional.forEach(() => {});
-        args.named && Object.values(args.named);
-      }
-      const [fn, ...positional] = args.positional;
-      fn(createEventLike(state), positional, args.named);
-    },
-
-    updateModifier(state, args) {
-      if (gte('3.22.0')) {
-        // Consume individual properties to entangle tracking.
-        // https://github.com/emberjs/ember.js/issues/19277
-        // https://github.com/ember-modifier/ember-modifier/pull/63#issuecomment-815908201
-        args.positional.forEach(() => {});
-        args.named && Object.values(args.named);
-      }
-      const [fn, ...positional] = args.positional;
-      fn(createEventLike(state), positional, args.named);
-    },
-
-    destroyModifier() {},
-  }),
-  class DidUpsertModifier {}
-);
+export default class DidUpsertModifier extends Modifier {
+  modify(element, positional, named) {
+    this.element = element;
+    const [fn, ...rest] = positional;
+    fn(createEventLike(this), rest, named);
+  }
+}