diff --git a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
index 01c1db9ec95..3c827a9ccd7 100644
--- a/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
+++ b/app/assets/javascripts/discourse/app/initializers/auto-load-modules.js
@@ -36,5 +36,6 @@ export function autoLoadModules(container, registry) {
 
 export default {
   name: "auto-load-modules",
+  after: "inject-objects",
   initialize: (container) => autoLoadModules(container, container.registry),
 };
diff --git a/app/assets/javascripts/discourse/app/initializers/inject-objects.js b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
index e195d4349e6..6f3c229da6a 100644
--- a/app/assets/javascripts/discourse/app/initializers/inject-objects.js
+++ b/app/assets/javascripts/discourse/app/initializers/inject-objects.js
@@ -6,6 +6,7 @@ import deprecated from "discourse-common/lib/deprecated";
 
 export default {
   name: "inject-objects",
+  after: isLegacyEmber() ? null : "export-application-global",
   initialize(container, app) {
     // This is required for Ember CLI tests to work
     setDefaultOwner(app.__container__);