diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index 5022d4077c..8e0b33bc2c 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -9,6 +9,7 @@ from frappe.website.website_generator import WebsiteGenerator
 from frappe.website.render import clear_cache
 from frappe.utils import today, cint, global_date_format, get_fullname
 from frappe.website.utils import find_first_image, get_comment_list
+from markdown2 import markdown
 
 class BlogPost(WebsiteGenerator):
 	save_versions = True
@@ -64,6 +65,9 @@ class BlogPost(WebsiteGenerator):
 			"description": context.description,
 		}
 
+		if "<!-- markdown -->" in context.content:
+			context.content = markdown(context.content)
+
 		image = find_first_image(self.content)
 		if image:
 			context.metatags["image"] = image
diff --git a/frappe/website/template.py b/frappe/website/template.py
index 3e9f529d75..e23d31a9e6 100644
--- a/frappe/website/template.py
+++ b/frappe/website/template.py
@@ -49,11 +49,6 @@ def render_blocks(context):
 	if "title" not in out:
 		out["title"] = context.get("title")
 
-	# markdown
-	if "<!-- markdown -->" in out.get("content", ""):
-		out["content"] = markdown(out["content"])
-
-
 	# header
 	if out["no_header"]:
 		out["header"] = ""