diff --git a/app/assets/javascripts/discourse/app/components/discourse-root.js b/app/assets/javascripts/discourse/app/components/discourse-root.js
index c1c6ac93a24..a0849beabad 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-root.js
+++ b/app/assets/javascripts/discourse/app/components/discourse-root.js
@@ -2,10 +2,4 @@ import Component from "@ember/component";
 
 let componentArgs = { tagName: "div", classNames: ["discourse-root"] };
 
-// 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);