diff --git a/app/assets/javascripts/discourse/app/components/discourse-root.js b/app/assets/javascripts/discourse/app/components/discourse-root.js
index e3d691f0531..c2f2f9add5c 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-root.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-root.js
@@ -1,11 +1,3 @@
-import Component from "@ember/component";
+import GlimmerComponent from "discourse/components/glimmer";
 
-let componentArgs = { tagName: "div" };
-
-// TODO: Once we've moved to Ember CLI completely we can remove this block
-// eslint-disable-next-line no-undef
-if (!Ember.FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-  componentArgs = { tagName: "" };
-}
-
-export default Component.extend(componentArgs);
+export default class DiscourseRoot extends GlimmerComponent {}