diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc
index d1a4a64ccd..d4cc2f2492 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-restrictions-tab.inc
@@ -1,5 +1,6 @@
 [% USE raw %]
 [% USE Koha %]
+[% USE HtmlScrubber %]
 [% PROCESS 'restriction-types.inc' %]
 
 [% IF ( patron.restrictions.count == 0 ) %]
@@ -25,9 +26,9 @@
                     </td>
                     <td>
                         [% IF restriction.comment.search('OVERDUES_PROCESS') %]
-                            <span>Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %]</span>
+                            <span>Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | scrub_html type => 'comment' | $raw %]</span>
                         [% ELSE %]
-                            [% restriction.comment | $raw %]
+                            [% restriction.comment | scrub_html type => 'comment' | $raw %]
                         [% END %]
                     </td>
                     <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index fc310d0fa2..8b1a1a90b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -1,5 +1,6 @@
 [% USE raw %]
 [% USE Branches %]
+[% USE HtmlScrubber %]
 [% USE Categories %]
 [% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') || 0 %]
 [% SET return_claims = patron.return_claims %]
@@ -104,7 +105,7 @@
                                 [% END %]
                                 </span>
                                 <span class="restriction_detail">
-                                [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%]
+                                [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | scrub_html type => 'comment' | html_line_break -%][%- END -%]
                                 </span>
                                 </div>
                             [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 5531fc7227..91c36c099e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -3,6 +3,7 @@
 [% USE To %]
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE HtmlScrubber %]
 [% USE Branches %]
 [% PROCESS 'member-main-address-style.inc' %]
 [% PROCESS 'member-alt-address-style.inc' %]
@@ -1533,9 +1534,9 @@ legend.collapsed i.fa.fa-caret-down::before {
                                                             <td>[% PROCESS restriction_type_description restriction_type=restriction.type %]</td>
                                                             <td>
                                                                 [% IF restriction.comment.search('OVERDUES_PROCESS') %]
-                                                                    Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw %]
+                                                                    Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | scrub_html type => 'comment' | $raw %]
                                                                 [% ELSE %]
-                                                                    [% restriction.comment | $raw %]
+                                                                    [% restriction.comment | scrub_html type => 'comment' | $raw %]
                                                                 [% END %]
                                                             </td>
                                                             <td>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 500273e90f..697736ccd2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -2,6 +2,7 @@
 [% USE Koha %]
 [% USE Branches %]
 [% USE KohaDates %]
+[% USE HtmlScrubber %]
 [% USE Price %]
 [% USE ItemTypes %]
 [% USE AuthorisedValues %]
@@ -59,7 +60,7 @@
                                             [% ELSE %]
                                                 [% FOR restriction IN logged_in_user.restrictions %]
                                                     <div class="patron_restriction">
-                                                        [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>, frozen until:
+                                                        [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: <span class="restriction_comment">[% restriction.comment | scrub_html type => 'comment' | html_line_break %]</span>, frozen until:
                                                         <span class="restriction_expiration">
                                                         [%- IF restriction.expiration -%]
                                                             [%- restriction.expiration | $KohaDates -%]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index f6b12e9202..60cac1d678 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -2,6 +2,7 @@
 [% USE Asset %]
 [% USE Koha %]
 [% USE KohaDates %]
+[% USE HtmlScrubber %]
 [% USE Branches %]
 [% USE I18N %]
 [% USE ItemTypes %]
@@ -177,10 +178,10 @@
                                                         <li class="patron_restriction">
                                                             <strong>[%- restriction.type.display_text | html -%]: </strong>
                                                             [% IF restriction.comment.search('OVERDUES_PROCESS') %]
-                                                                Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | html_line_break %]
+                                                                Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | scrub_html type => 'comment' | html_line_break %]
                                                             [% ELSE %]
                                                                 [%- IF restriction.comment -%]
-                                                                    <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>.
+                                                                    <span class="restriction_comment">[% restriction.comment | scrub_html type => 'comment' | html_line_break %]</span>.
                                                                 [%- END -%]
                                                             [% END %]
                                                             [%- IF restriction.expiration -%]