diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
index ed145e4a216..4b562eaecc6 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js.es6
@@ -4,7 +4,7 @@ import Component from "@ember/component";
 /* global Pikaday:true */
 import { propertyNotEqual } from "discourse/lib/computed";
 import loadScript from "discourse/lib/load-script";
-import computed from "ember-addons/ember-computed-decorators";
+import computed from "discourse-common/utils/decorators";
 import { cookAsync } from "discourse/lib/text";
 import discourseDebounce from "discourse/lib/debounce";
 import { observes } from "discourse-common/utils/decorators";
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index ec09a44a96a..220c8dc07ae 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -3,7 +3,7 @@ import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
 import { ajax } from "discourse/lib/ajax";
-import computed, { observes, on } from "ember-addons/ember-computed-decorators";
+import computed, { observes, on } from "discourse-common/utils/decorators";
 
 export const keepAliveDuration = 10000;
 export const bufferTime = 3000;
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
index 9d1708ffab7..c022cd50edb 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
@@ -1,7 +1,7 @@
 import { debounce } from "@ember/runloop";
 import { cancel } from "@ember/runloop";
 import Component from "@ember/component";
-import computed, { on } from "ember-addons/ember-computed-decorators";
+import computed, { on } from "discourse-common/utils/decorators";
 import {
   keepAliveDuration,
   bufferTime