diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
index 61099da882..815d9a258a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
@@ -5,6 +5,7 @@
 [% USE ItemTypes %]
 [% USE Branches %]
 [% USE TablesSettings %]
+[% USE HtmlScrubber %]
 [% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -102,7 +103,7 @@
                         </div>
                     </li>
                     <li><span class="label">Staff note</span> [% course.staff_note | html %]</li>
-                    <li><span class="label">Public note</span> [% course.public_note | $raw %]</li>
+                    <li><span class="label">Public note</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>
                     <li><span class="label">Student count</span> [% course.students_count | html %]</li>
                     <li><span class="label">Status</span> [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]</li>
                 </ol>
@@ -263,9 +264,9 @@
                                         [% END %]
                                     </td>
                                     <td>[% IF (cr.public_note) %]
-                                            [% cr.public_note | $raw %]
+                                            [% cr.public_note | scrub_html type => 'note' | $raw %]
                                         [% ELSIF (cr.item.itemnotes) %]
-                                            [% cr.item.itemnotes | $raw %]
+                                            [% cr.item.itemnotes | scrub_html type => 'note' | $raw %]
                                         [% END %]
                                     </td>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
index 8c06c578c8..ab26e62911 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
@@ -2,6 +2,7 @@
 [% USE Asset %]
 [% USE AuthorisedValues %]
 [% USE TablesSettings %]
+[% USE HtmlScrubber %]
 [% PROCESS 'i18n.inc' %]
 [% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
@@ -75,7 +76,7 @@
                                             [% END %]
                                         </td>
                                         <td>[% c.staff_note | html %]</td>
-                                        <td>[% c.public_note | $raw %]</td>
+                                        <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
                                         <td>[% c.students_count | html %]</td>
                                         <td>
                                             [% IF c.enabled == 'yes' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
index 5ce9a87fa4..c34a5cc8de 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
@@ -6,6 +6,7 @@
 [% USE ItemTypes %]
 [% USE Branches %]
 [% USE TablesSettings %]
+[% USE HtmlScrubber %]
 [% PROCESS 'i18n.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Course reserves for [% course.course_name | html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
@@ -49,7 +50,7 @@
                                     </ul>
                                 </li>
                             [% END %]
-                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | $raw %]</li>[% END %]
+                            [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | scrub_html type => 'note' | $raw %]</li>[% END %]
                         </ol>
                     </div>
 
@@ -90,9 +91,9 @@
                                         </td>
                                         <td data-order="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates  as_due_date => 1 %]</td>
                                         <td>[% IF ( cr.public_note ) %]
-                                                [% cr.public_note | $raw %]
+                                                [% cr.public_note | scrub_html type => 'note' | $raw %]
                                             [% ELSIF ( cr.item.itemnotes ) %]
-                                                [% cr.item.itemnotes | $raw %]
+                                                [% cr.item.itemnotes | scrub_html type => 'note' | $raw %]
                                             [% END %]
                                         </td>
                                         <td>[% IF (cr.item.uri) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
index b6e67303f3..f6d4085b14 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
@@ -6,6 +6,7 @@
 [% PROCESS 'i18n.inc' %]
 
 [% INCLUDE 'doc-head-open.inc' %]
+[% USE HtmlScrubber %]
 <title>Courses &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %]
@@ -57,7 +58,7 @@
                                           <div class="instructor"><span class="inst_surname">[% i.surname | html %]</span>[% IF i.firstname %]<span class="instr_separator">, </span><span class="instr_firstname">[% i.firstname | html %]</span>[% END %]</div>
                                       [% END %]
                                     </td>
-                                    <td>[% c.public_note | $raw %]</td>
+                                    <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td>
                                     <td></td>
                             [% END %]
                         </tbody>