diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0678a010cb1..3f6c9ff7441 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -34,9 +34,9 @@
     <%- end %>
 
     <%- unless customization_disabled? %>
-      <%= raw theme_translations_lookup %>
-      <%= raw theme_js_lookup %>
-      <%= raw theme_lookup("head_tag") %>
+      <%= theme_translations_lookup %>
+      <%= theme_js_lookup %>
+      <%= theme_lookup("head_tag") %>
     <%- end %>
 
     <%= render_google_tag_manager_head_code %>
@@ -112,7 +112,7 @@
     <%= preload_script 'browser-update' %>
 
     <%- unless customization_disabled? %>
-      <%= raw theme_lookup("body_tag") %>
+      <%= theme_lookup("body_tag") %>
     <%- end %>
     <%= build_plugin_html 'server:before-body-close' %>
   </body>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index 3dadbb179e9..e8fc43c0231 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -45,6 +45,7 @@
       </nav>
       <p class='powered-by-link'><%= t 'powered_by_html' %></p>
     </footer>
+    <%= theme_lookup("footer") %>
     <%= theme_lookup("body_tag") %>
   </body>
   <%= yield :after_body %>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index 29f0f52a6db..4a0264b0055 100644
--- a/app/views/layouts/no_ember.html.erb
+++ b/app/views/layouts/no_ember.html.erb
@@ -22,6 +22,7 @@
     </div>
   </section>
   <%= theme_lookup("footer") %>
+  <%= theme_lookup("body_tag") %>
   <%= build_plugin_html 'no-client:footer' %>
   <%= build_plugin_html 'server:before-body-close' %>
 </body>