diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 164ac424d..638b28bf7 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -232,7 +232,7 @@
                                         {% elif c.datatype == 'datetime' %}
                                             {{ column.value|formatdate }}
                                         {% elif c.datatype == 'comments' %}
-                                            {{ column.value|safe }}
+                                            {{ column.value|clean_string|safe }}
                                         {% elif c.datatype == 'series' %}
                                             {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
                                         {% elif c.datatype == 'text' %}
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 6627daac4..70ebc14b7 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -94,7 +94,7 @@
                             {% elif c.datatype == 'datetime' %}
                                 {{ column.value|formatdate }}
                             {% elif c.datatype == 'comments' %}
-                                {{ column.value|safe }}
+                                {{ column.value|clean_string|safe }}
                             {% elif c.datatype == 'series' %}
                                 {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
                             {% elif c.datatype == 'text' %}
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 375a871b4..836c80928 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -134,7 +134,7 @@
                 {% elif c.datatype == 'datetime' %}
                   {{ column.value|formatdate }}
                 {% elif c.datatype == 'comments' %}
-                  {{column.value|safe}}
+                  {{column.value|clean_string|safe}}
                 {% elif c.datatype == 'series' %}
                   {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
                 {% elif c.datatype == 'text' %}