diff --git a/public/s/js/user_comments.js b/public/s/js/user_comments.js
index 7df63fe..f8c4be7 100644
--- a/public/s/js/user_comments.js
+++ b/public/s/js/user_comments.js
@@ -125,8 +125,7 @@ class UserCommentSystem {
             safe = safe
                 .replace(/&/g, "&")
                 .replace(/</g, "&lt;")
-                .replace(/"/g, "&quot;")
-                .replace(/'/g, "&#039;");
+                .replace(/"/g, "&quot;");
 
             const renderer = new marked.Renderer();
             renderer.blockquote = function (quote) {
@@ -179,9 +178,8 @@ class UserCommentSystem {
         return unsafe
             .replace(/&/g, "&amp;")
             .replace(/</g, "&lt;")
-            .replace(/>/g, "&gt;")
             .replace(/"/g, "&quot;")
-            .replace(/'/g, "&#039;");
+            .replace(/>/g, "&gt;");
     }
 }
 
diff --git a/src/inc/routes/comments.mjs b/src/inc/routes/comments.mjs
index 95b9fe2..4f1ea21 100644
--- a/src/inc/routes/comments.mjs
+++ b/src/inc/routes/comments.mjs
@@ -133,7 +133,7 @@ export default (router, tpl) => {
             if (isJson) {
                 return res.reply({
                     headers: { 'Content-Type': 'application/json; charset=utf-8' },
-                    body: JSON.stringify({ success: true, comments: processedComments })
+                    body: JSON.stringify({ success: true, comments: comments })
                 });
             }