diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 24f879f687f..7908ab90c50 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -19,9 +19,7 @@ var define, requirejs;
         default: Ember.ArrayProxy
       },
       "@ember/component": {
-        default: Ember.Component,
-        TextArea: Ember.TextArea,
-        TextField: Ember.TextField
+        default: Ember.Component
       },
       "@ember/controller": {
         default: Ember.Controller,
@@ -129,6 +127,12 @@ var define, requirejs;
       "@ember/component/helper": {
         default: Ember.Helper
       },
+      "@ember/component/text-field": {
+        default: Ember.TextField
+      },
+      "@ember/component/text-area": {
+        default: Ember.TextArea
+      },
       "@ember/error": {
         default: Ember.error
       },
diff --git a/app/assets/javascripts/discourse/app/components/expanding-text-area.js b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
index 94c976c4d33..821f9cf69dd 100644
--- a/app/assets/javascripts/discourse/app/components/expanding-text-area.js
+++ b/app/assets/javascripts/discourse/app/components/expanding-text-area.js
@@ -1,4 +1,4 @@
-import { TextArea } from "@ember/component";
+import TextArea from "@ember/component/text-area";
 import { schedule } from "@ember/runloop";
 import { on, observes } from "discourse-common/utils/decorators";
 import autosize from "discourse/lib/autosize";
diff --git a/app/assets/javascripts/discourse/app/components/honeypot-input.js b/app/assets/javascripts/discourse/app/components/honeypot-input.js
index 9eb256bc12d..c3d003d0d4c 100644
--- a/app/assets/javascripts/discourse/app/components/honeypot-input.js
+++ b/app/assets/javascripts/discourse/app/components/honeypot-input.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "discourse/components/text-field";
 import { on } from "discourse-common/utils/decorators";
 
 export default TextField.extend({
diff --git a/app/assets/javascripts/discourse/app/components/number-field.js b/app/assets/javascripts/discourse/app/components/number-field.js
index 6f78cc37076..feb61f36b10 100644
--- a/app/assets/javascripts/discourse/app/components/number-field.js
+++ b/app/assets/javascripts/discourse/app/components/number-field.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "discourse/components/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default TextField.extend({
diff --git a/app/assets/javascripts/discourse/app/components/text-field.js b/app/assets/javascripts/discourse/app/components/text-field.js
index 3477520d0bc..5809d25a86c 100644
--- a/app/assets/javascripts/discourse/app/components/text-field.js
+++ b/app/assets/javascripts/discourse/app/components/text-field.js
@@ -1,4 +1,4 @@
-import { TextField } from "@ember/component";
+import TextField from "@ember/component/text-field";
 import discourseComputed from "discourse-common/utils/decorators";
 import { siteDir, isRTL, isLTR } from "discourse/lib/text-direction";
 import { next, debounce, cancel } from "@ember/runloop";