diff --git a/app/assets/javascripts/ember-addons/decorator-alias.js.es6 b/app/assets/javascripts/ember-addons/decorator-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/decorator-alias.js.es6
rename to app/assets/javascripts/ember-addons/decorator-alias.js
diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/fmt.js.es6
rename to app/assets/javascripts/ember-addons/fmt.js
diff --git a/app/assets/javascripts/ember-addons/macro-alias.js.es6 b/app/assets/javascripts/ember-addons/macro-alias.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/macro-alias.js.es6
rename to app/assets/javascripts/ember-addons/macro-alias.js
diff --git a/app/assets/javascripts/ember-addons/utils/extract-value.js.es6 b/app/assets/javascripts/ember-addons/utils/extract-value.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/extract-value.js.es6
rename to app/assets/javascripts/ember-addons/utils/extract-value.js
diff --git a/app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/handle-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/handle-descriptor.js
diff --git a/app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6 b/app/assets/javascripts/ember-addons/utils/is-descriptor.js
similarity index 100%
rename from app/assets/javascripts/ember-addons/utils/is-descriptor.js.es6
rename to app/assets/javascripts/ember-addons/utils/is-descriptor.js
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
index d2d671e0ac..5d41d23bb7 100644
--- a/lib/discourse_js_processor.rb
+++ b/lib/discourse_js_processor.rb
@@ -41,7 +41,8 @@ class DiscourseJsProcessor
       relative_path.start_with?("app/assets/javascripts/pretty-text/") ||
       relative_path.start_with?("app/assets/javascripts/select-kit/") ||
       relative_path.start_with?("app/assets/javascripts/wizard/") ||
-      relative_path.start_with?("app/assets/javascripts/discourse-common/")
+      relative_path.start_with?("app/assets/javascripts/discourse-common/") ||
+      relative_path.start_with?("app/assets/javascripts/ember-addons/")
   end
 
   def self.skip_module?(data)