diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py
index ea1745d..2ad969b 100644
--- a/pagure/internal/__init__.py
+++ b/pagure/internal/__init__.py
@@ -94,6 +94,7 @@ def pull_request_add_comment():
         flask.abort(400, 'Invalid request')
 
     commit = form.commit.data or None
+    tree_id = form.tree_id.data or None
     filename = form.filename.data or None
     row = form.row.data or None
     comment = form.comment.data
@@ -103,6 +104,7 @@ def pull_request_add_comment():
             pagure.SESSION,
             request=request,
             commit=commit,
+            tree_id=tree_id,
             filename=filename,
             row=row,
             comment=comment,
diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index f32d3d3..c291849 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1819,7 +1819,7 @@ def close_pull_request(session, request, user, requestfolder, merged=True):
 
     pagure.lib.add_pull_request_comment(
         session, request,
-        commit=None, filename=None, row=None,
+        commit=None, tree_id=None, filename=None, row=None,
         comment='Pull-Request has been %s by %s' % (
             request.status.lower(), user),
         user=user,
diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 7a7bdd7..7b55ea4 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -587,6 +587,7 @@ def update_request_from_git(
                 session,
                 request,
                 commit=comment['commit'],
+                tree_id=comment.get('tree_id') or None,
                 filename=comment['filename'],
                 row=comment['line'],
                 comment=comment['comment'],
@@ -1164,7 +1165,7 @@ def diff_pull_request(
             if request.merge_status is None:
                 pagure.lib.add_pull_request_comment(
                     session, request,
-                    commit=None, filename=None, row=None,
+                    commit=None, tree_id=None, filename=None, row=None,
                     comment='Pull-Request has been %s' % verb,
                     user=request.user.username,
                     requestfolder=requestfolder,