diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6 b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
index 87b26f5ef1a..9cd1682ff63 100644
--- a/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
@@ -1,7 +1,8 @@
 import ApiKey from "admin/models/api-key";
 import { default as computed } from "ember-addons/ember-computed-decorators";
+import Controller from "@ember/controller";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.[]")
   hasMasterKey(model) {
     return !!model.findBy("user", null);
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
index 9f335032e30..b9ef7380b68 100644
--- a/app/assets/javascripts/admin/models/watched-word.js.es6
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -1,4 +1,5 @@
 import { ajax } from "discourse/lib/ajax";
+import EmberObject from "@ember/object";
 
 const WatchedWord = Discourse.Model.extend({
   save() {
@@ -37,7 +38,7 @@ WatchedWord.reopenClass({
       });
 
       return Object.keys(actions).map(n => {
-        return Ember.Object.create({
+        return EmberObject.create({
           nameKey: n,
           name: I18n.t("admin.watched_words.actions." + n),
           words: actions[n],
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 8d2d9ffb979..f20e7d1ab73 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -6,6 +6,8 @@ var define, requirejs;
   if (typeof Ember !== "undefined") {
     EMBER_MODULES = {
       "@ember/component": { default: Ember.Component },
+      "@ember/controller": { default: Ember.Controller },
+      "@ember/object": { default: Ember.Object },
       "@ember/routing/route": { default: Ember.Route }
     };
   }