diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
index 1c533b7dde5..13e5309dbc9 100644
--- a/mod/forum/templates/discussion_list.mustache
+++ b/mod/forum/templates/discussion_list.mustache
@@ -222,7 +222,7 @@
                                             <span>
                                                  <button class="btn badge badge-primary rounded border-0" data-region="timed-label"
                                                     data-toggle="popover" data-container="body" data-placement="right" data-html="true"
-                                                    data-content={{#quote}}{{#discussion.timed}}{{#discussion.times}}{{> mod_forum/discussion_times}}{{/discussion.times}}{{/discussion.timed}}{{/quote}}
+                                                    data-content="{{#discussion.timed}}{{#discussion.times}}{{> mod_forum/discussion_times}}{{/discussion.times}}{{/discussion.timed}}"
                                                     data-trigger="click" aria-label="{{#str}}timeddiscussion, forum{{/str}}" title="{{#str}}timeddiscussion, forum{{/str}}">
                                                      {{#str}}timed, forum{{/str}}
                                                  </button>
diff --git a/mod/forum/templates/discussion_times.mustache b/mod/forum/templates/discussion_times.mustache
index e35828d1513..2b0c35723e8 100644
--- a/mod/forum/templates/discussion_times.mustache
+++ b/mod/forum/templates/discussion_times.mustache
@@ -17,7 +17,8 @@
 {{!
     @template mod_forum/discussion_times
 
-    Template to display the discussion times.
+    Template to display the discussion times. Note that this template is used only as a partial from within discussion_list, which
+    requires the language strings be passed through the cleanstr helper
 
     Classes required for JS:
     * none
@@ -40,20 +41,20 @@
 <ul>
 {{#start}}
     <li>
-        {{#str}} displaystartdate, mod_forum, {{#userdate}}{{.}}, {{#str}}strftimerecentfull {{/str}}{{/userdate}} {{/str}}
+        {{#cleanstr}} displaystartdate, mod_forum, {{#userdate}}{{.}}, {{#str}}strftimerecentfull {{/str}}{{/userdate}} {{/cleanstr}}
     </li>
 {{/start}}
 {{#end}}
     <li>
-        {{#str}} displayenddate, mod_forum, {{#userdate}}{{.}}, {{#str}}strftimerecentfull {{/str}}{{/userdate}} {{/str}}
+        {{#cleanstr}} displayenddate, mod_forum, {{#userdate}}{{.}}, {{#str}}strftimerecentfull {{/str}}{{/userdate}} {{/cleanstr}}
     </li>
 {{/end}}
     <li>
     {{#visible}}
-        {{#str}} timedvisible, mod_forum {{/str}}
+        {{#cleanstr}} timedvisible, mod_forum {{/cleanstr}}
     {{/visible}}
     {{^visible}}
-        {{#str}} timedhidden, mod_forum {{/str}}
+        {{#cleanstr}} timedhidden, mod_forum {{/cleanstr}}
     {{/visible}}
     </li>
 </ul>