diff --git a/phpmyfaq/src/phpMyFAQ/Comments.php b/phpmyfaq/src/phpMyFAQ/Comments.php
index bf14602ecf..eed56d8b27 100644
--- a/phpmyfaq/src/phpMyFAQ/Comments.php
+++ b/phpmyfaq/src/phpMyFAQ/Comments.php
@@ -159,7 +159,7 @@ private function showShortComment(int $id, string $comment): string
 
         $comment = '';
         foreach ($words as $word) {
-            $comment .= $word . ' ';
+            $comment .= Strings::htmlentities($word . ' ');
             if (15 === $numWords) {
                 $comment .= '<span class="comment-dots-' . $id . '">&hellip; </span>' .
                     '<a href="#" data-comment-id="' . $id . '" class="pmf-comments-show-more comment-show-more-' . $id .