diff --git a/frappe/templates/includes/web_block.html b/frappe/templates/includes/web_block.html
index 17940ca221..0805e743c0 100644
--- a/frappe/templates/includes/web_block.html
+++ b/frappe/templates/includes/web_block.html
@@ -7,19 +7,19 @@
 	web_block.css_class
 ]) -%}
 
-{%- if web_template.type == 'Section' -%}
+{%- if web_template_type == 'Section' -%}
 {%- if not web_block.hide_block -%}
 <section class="section {{ classes }}" data-section-idx="{{ web_block.idx | e }}"
 	data-section-template="{{ web_block.web_template | e }}">
 	{%- if web_block.add_container -%}
 	<div class="container">
 	{%- endif -%}
-		{{ web_template.render(web_block.web_template_values) }}
+		{{ web_template_html }}
 	{%- if web_block.add_container -%}
 	</div>
 	{%- endif -%}
 </section>
 {%- endif -%}
 {%- else -%}
-{{ web_template.render(web_block.web_template_values) }}
+{{ web_template_html }}
 {%- endif -%}
diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py
index f3e3a5960c..e78054b88b 100644
--- a/frappe/website/doctype/web_page/web_page.py
+++ b/frappe/website/doctype/web_page/web_page.py
@@ -209,8 +209,11 @@ def get_web_blocks_html(blocks):
 	extracted_styles = []
 	for block in blocks:
 		web_template = frappe.get_cached_doc('Web Template', block.web_template)
-		rendered_html = frappe.render_template('templates/includes/web_block.html',
-			context={'web_block': block, 'web_template': web_template})
+		rendered_html = frappe.render_template('templates/includes/web_block.html', context={
+			'web_block': block,
+			'web_template_html': web_template.render(block.web_template_values),
+			'web_template_type': web_template.type
+		})
 		html, scripts, styles = extract_script_and_style_tags(rendered_html)
 		out.html += html
 		if block.web_template not in extracted_scripts: