diff --git a/src/templates/nodes/custom/comment/_macros.pug b/src/templates/nodes/custom/comment/_macros.pug
index c0dcd77d..3768a9dd 100644
--- a/src/templates/nodes/custom/comment/_macros.pug
+++ b/src/templates/nodes/custom/comment/_macros.pug
@@ -11,7 +11,7 @@
 		.comment-body
 			p.comment-author {{ comment._user.full_name }}
 
-			span {{comment.properties._content_html | safe }}
+			span {{comment.properties | markdowned('content') }}
 
 		// TODO: Markdown preview when editing
 
diff --git a/tests/test_web/test_jinja.py b/tests/test_web/test_jinja.py
index ac02fb99..8dccc9de 100644
--- a/tests/test_web/test_jinja.py
+++ b/tests/test_web/test_jinja.py
@@ -19,3 +19,13 @@ class MarkdownTest(unittest.TestCase):
 
         self.assertEqual(None, jinja.do_markdown(None))
         self.assertEqual('', jinja.do_markdown(''))
+
+    def test_markdowned(self):
+        from pillar.web import jinja
+
+        self.assertEqual(None, jinja.do_markdowned({'eek': None}, 'eek'))
+        self.assertEqual('<p>ook</p>\n', jinja.do_markdowned({'eek': 'ook'}, 'eek'))
+        self.assertEqual('<p>ook</p>\n', jinja.do_markdowned(
+            {'eek': 'ook', '_eek_html': None}, 'eek'))
+        self.assertEqual('prerendered', jinja.do_markdowned(
+            {'eek': 'ook', '_eek_html': 'prerendered'}, 'eek'))