diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js
index bddd2f6a810..d138b54ac6e 100644
--- a/app/assets/javascripts/discourse/app/helpers/raw.js
+++ b/app/assets/javascripts/discourse/app/helpers/raw.js
@@ -13,8 +13,8 @@ function renderRaw(ctx, template, templateName, params) {
     const viewClass = context.registry.resolve(`raw-view:${templateName}`);
 
     if (viewClass) {
+      setOwner(params, getOwner(context));
       params.view = viewClass.create(params, context);
-      setOwner(params.view, getOwner(context.site));
     }
 
     if (!params.view) {