diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index adad4c685fb..000cd89701e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -95,7 +95,7 @@ class ApplicationController < ActionController::Base
   end
 
   def ember_cli_required?
-    ENV['NO_EMBER_CLI'] != '1' && Rails.env.development?
+    Rails.env.development? && ENV['NO_EMBER_CLI'] != '1' && request.headers['X-Discourse-Ember-CLI'] != 'true'
   end
 
   def application_layout