diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index f1c4f3b3f5..818dc8bce6 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -280,6 +280,16 @@ class TestWebsite(unittest.TestCase):
 
 		frappe.flags.force_website_cache = False
 
+	def test_safe_render(self):
+		content = get_response_content('/_test/_test_safe_render_on')
+		self.assertNotIn("Safe Render On", content)
+		self.assertIn("frappe.exceptions.ValidationError: Illegal template", content)
+
+		content = get_response_content('/_test/_test_safe_render_off')
+		self.assertIn("Safe Render Off", content)
+		self.assertIn("test.__test", content)
+		self.assertNotIn("frappe.exceptions.ValidationError: Illegal template", content)
+
 
 def set_home_page_hook(key, value):
 	from frappe import hooks
diff --git a/frappe/www/_test/_test_safe_render_off.html b/frappe/www/_test/_test_safe_render_off.html
new file mode 100644
index 0000000000..5ad01d67d5
--- /dev/null
+++ b/frappe/www/_test/_test_safe_render_off.html
@@ -0,0 +1,7 @@
+---
+title: Safe Render Off
+safe_render: false
+---
+
+<div>{{ title }}</div>
+<div>test.__test</div>
diff --git a/frappe/www/_test/_test_safe_render_on.html b/frappe/www/_test/_test_safe_render_on.html
new file mode 100644
index 0000000000..d9f02ce081
--- /dev/null
+++ b/frappe/www/_test/_test_safe_render_on.html
@@ -0,0 +1,6 @@
+---
+title: Safe Render On
+---
+
+<div>{{ title }}</div>
+<div>test.__test</div>