diff --git a/mod/forum/classes/local/renderers/discussion_list.php b/mod/forum/classes/local/renderers/discussion_list.php
index 96a07256ca8..fcb76925215 100644
--- a/mod/forum/classes/local/renderers/discussion_list.php
+++ b/mod/forum/classes/local/renderers/discussion_list.php
@@ -186,9 +186,9 @@ class discussion_list {
             'forum' => (array) $forumexporter->export($this->renderer),
             'contextid' => $forum->get_context()->id,
             'cmid' => $cm->id,
-            'name' => $forum->get_name(),
+            'name' => format_string($forum->get_name()),
             'courseid' => $course->id,
-            'coursename' => $course->shortname,
+            'coursename' => format_string($course->shortname),
             'experimentaldisplaymode' => $displaymode == FORUM_MODE_NESTED_V2,
             'gradingcomponent' => $this->forumgradeitem->get_grading_component_name(),
             'gradingcomponentsubtype' => $this->forumgradeitem->get_grading_component_subtype(),
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 9514e74ba92..d6828232130 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -179,9 +179,9 @@ switch ($forum->get_type()) {
                 $gradeobj = (object) [
                     'contextid' => $forum->get_context()->id,
                     'cmid' => $cmid,
-                    'name' => $forum->get_name(),
+                    'name' => format_string($forum->get_name()),
                     'courseid' => $course->id,
-                    'coursename' => $course->shortname,
+                    'coursename' => format_string($course->shortname),
                     'experimentaldisplaymode' => $displaymode == FORUM_MODE_NESTED_V2,
                     'groupid' => $groupid,
                     'gradingcomponent' => $forumgradeitem->get_grading_component_name(),
@@ -196,9 +196,9 @@ switch ($forum->get_type()) {
                 $gradeobj = (object) [
                     'contextid' => $forum->get_context()->id,
                     'cmid' => $cmid,
-                    'name' => $forum->get_name(),
+                    'name' => format_string($forum->get_name()),
                     'courseid' => $course->id,
-                    'coursename' => $course->shortname,
+                    'coursename' => format_string($course->shortname),
                     'groupid' => $groupid,
                     'userid' => $USER->id,
                     'gradingcomponent' => $forumgradeitem->get_grading_component_name(),