diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index dd0c4a7f8d..ab9eb65489 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -64,7 +64,7 @@ if (count($comments) === 0) {
         <?php endif ?>
           <br>
           <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-            ? '[' . $comment->author . '] '
+            ? '[' . $this->escape($comment->author) . '] '
             : '';
           ?><?= $this->escape($comment->comment); ?>
           <br>
diff --git a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
index e31f1fdce9..98ee0534b6 100644
--- a/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
+++ b/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml
@@ -13,6 +13,6 @@
 
 <br>
 <?= $this->icon('comment', $this->translate('Comment')); ?> <?= isset($comment->author)
-  ? '[' . $comment->author . '] '
+  ? '[' . $this->escape($comment->author) . '] '
   : '';
 ?><?= $this->escape($comment->comment); ?>