diff --git a/app/models/theme.rb b/app/models/theme.rb
index 4ec449ab4ae..fa981386433 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -6,7 +6,7 @@ require 'json_schemer'
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 62
+  BASE_COMPILER_VERSION = 63
 
   attr_accessor :child_components
 
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index f20801df74d..a0b80685f6a 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -92,7 +92,7 @@ class ThemeField < ActiveRecord::Base
         if is_raw
           js_compiler.append_raw_template(name, hbs_template)
         else
-          js_compiler.append_ember_template(name, hbs_template)
+          js_compiler.append_ember_template("discourse/templates/#{name}", hbs_template)
         end
       rescue ThemeJavascriptCompiler::CompileError => ex
         errors << ex.message
diff --git a/spec/models/theme_field_spec.rb b/spec/models/theme_field_spec.rb
index 3e31fdac8a5..58154c825b3 100644
--- a/spec/models/theme_field_spec.rb
+++ b/spec/models/theme_field_spec.rb
@@ -134,6 +134,7 @@ HTML
     expect(javascript_cache.content).to include("testing-div")
     expect(javascript_cache.content).to include("string_setting")
     expect(javascript_cache.content).to include("test text \\\" 123!")
+    expect(javascript_cache.content).to include("define(\"discourse/theme-#{theme_field.theme_id}/discourse/templates/my-template\"")
   end
 
   it "correctly generates errors for transpiled css" do