diff --git a/server.js b/server.js
index 55565729d97652bf4dc9986f07bea1afa4c1096e..9e438f1ab15c4d28595697c6ac10843e261d39d4 100644
--- a/server.js
+++ b/server.js
@@ -246,16 +246,22 @@ app.post('/thread/:id/comment', isAuthenticated, (req, res) => {
 // เธฅเธšเธ„เธญเธกเน€เธกเธ™เธ•เนŒ
 app.get('/comment/delete/:id', isAuthenticated, (req, res) => {
   const commentId = req.params.id;
-  connection.query(
-    'SELECT * FROM comments WHERE id = ? AND user_id = ?',
+
+   connection.query(
+    'SELECT * FROM comments WHERE comment_id = ? AND user_id = ?',
     [commentId, req.session.userId],
     (err, results) => {
       if (err || results.length === 0) return res.send('เน„เธกเนˆเธžเธšเธ„เธญเธกเน€เธกเธ™เธ•เนŒเธ—เธตเนˆเธ•เน‰เธญเธ‡เธเธฒเธฃเธฅเธš');
+
       const comment = results[0];
-      connection.query('DELETE FROM comments WHERE id = ?', [commentId], (err2) => {
-        if (err2) return res.send('เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เนƒเธ™เธเธฒเธฃเธฅเธšเธ„เธญเธกเน€เธกเธ™เธ•เนŒ');
-        res.redirect(`/thread/${comment.thread_id}`);
-      });
+      connection.query(
+        'DELETE FROM comments WHERE comment_id = ?', 
+        [commentId], 
+        (err2) => {
+          if (err2) return res.send('เน€เธเธดเธ”เธ‚เน‰เธญเธœเธดเธ”เธžเธฅเธฒเธ”เนƒเธ™เธเธฒเธฃเธฅเธšเธ„เธญเธกเน€เธกเธ™เธ•เนŒ');
+          res.redirect(`/thread/${comment.thread_id}`);
+        }
+      );
     }
   );
 });
diff --git a/views/thread-view.ejs b/views/thread-view.ejs
index 1157bad25192cc7e5358b04b918985e52ada8169..91e52e4b98fdd8f72c4ba53b9ff26d65df36d700 100644
--- a/views/thread-view.ejs
+++ b/views/thread-view.ejs
@@ -61,7 +61,7 @@
 
             <!-- เธ›เธธเนˆเธกเธฅเธšเธ„เธญเธกเน€เธกเธ™เธ•เนŒ (เน€เธ‰เธžเธฒเธฐเน€เธˆเน‰เธฒเธ‚เธญเธ‡เธ„เธญเธกเน€เธกเธ™เธ•เนŒ) -->
             <% if (c.user_id === userId) { %>
-              <a href="/comment/delete/<%= c.id %>"
+              <a href="/comment/delete/<%= c.comment_id %>"
                  class="btn btn-sm btn-outline-danger float-right"
                  onclick="return confirm('Delete this comment?');">
                 Delete