diff --git a/assets/javascripts/admin/components/rule-row.js.es6 b/assets/javascripts/admin/components/rule-row.js.es6
index 7256f84..6fede6d 100644
--- a/assets/javascripts/admin/components/rule-row.js.es6
+++ b/assets/javascripts/admin/components/rule-row.js.es6
@@ -1,5 +1,5 @@
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import computed from "ember-addons/ember-computed-decorators";
+import computed from "discourse-common/utils/decorators";
 
 export default Ember.Component.extend({
   tagName: "tr",
diff --git a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6 b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6
index 9ff22ee..e9bc2fc 100644
--- a/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6
+++ b/assets/javascripts/admin/controllers/admin-plugins-chat-provider.js.es6
@@ -1,5 +1,5 @@
 import showModal from "discourse/lib/show-modal";
-import computed from "ember-addons/ember-computed-decorators";
+import computed from "discourse-common/utils/decorators";
 
 export default Ember.Controller.extend({
   modalShowing: false,
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6
index d8d8a42..5e16bbb 100644
--- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6
+++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-channel.js.es6
@@ -5,7 +5,7 @@ import {
   default as computed,
   observes,
   on
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   @on("init")
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6
index 2441e56..e2b4ad6 100644
--- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6
+++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-edit-rule.js.es6
@@ -1,9 +1,6 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import {
-  default as computed,
-  on
-} from "ember-addons/ember-computed-decorators";
+import { default as computed, on } from "discourse-common/utils/decorators";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   saveDisabled: false,
diff --git a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6 b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6
index 68009b5..52f8931 100644
--- a/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6
+++ b/assets/javascripts/admin/controllers/modals/admin-plugins-chat-test.js.es6
@@ -1,10 +1,7 @@
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import {
-  default as computed,
-  on
-} from "ember-addons/ember-computed-decorators";
+import { default as computed, on } from "discourse-common/utils/decorators";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   @on("init")
diff --git a/assets/javascripts/admin/models/rule.js.es6 b/assets/javascripts/admin/models/rule.js.es6
index 4fd6413..19346dc 100644
--- a/assets/javascripts/admin/models/rule.js.es6
+++ b/assets/javascripts/admin/models/rule.js.es6
@@ -3,7 +3,7 @@ import Category from "discourse/models/category";
 import {
   default as computed,
   observes
-} from "ember-addons/ember-computed-decorators";
+} from "discourse-common/utils/decorators";
 
 export default RestModel.extend({
   available_filters: [