diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 7c34fdfbf09..6e8e8657d49 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -1,11 +1,10 @@
 Handlebars.registerHelper('raw', function(property, options) {
+  var template = Discourse.__container__.lookup('template:' + property + ".raw"),
+      params = options.hash;
 
-  var template = Em.TEMPLATES[property + ".raw"];
-  var params = options.hash;
-
-  if(params) {
-    for(var prop in params){
-      if(options.hashTypes[prop] === "ID") {
+  if (params) {
+    for (var prop in params) {
+      if (options.hashTypes[prop] === "ID") {
         params[prop] = Em.Handlebars.get(this, params[prop], options);
       }
     }