diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index a871424..774f6e0 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -144,8 +144,7 @@
             </a>
           {% endif %}
           {% if id != 0 and g.fas_user and (
-              (comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username)
-              or repo_admin) %}
+              comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %}
           <a class="btn btn-secondary btn-sm edit_btn" href="{{
             '%s/comment/%s/edit' % (request.base_url, comment.id) }}"
             data-comment="{{ comment.id }}" data-objid="{{ issueid }}">
@@ -153,8 +152,7 @@
           </a>
           {% endif %}
           {% if id != 0 and g.fas_user and (
-              (comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username)
-              or repo_admin) %}
+              comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username) %}
           <button class="btn btn-secondary btn-sm" type="submit" name="drop_comment" value="{{ comment.id }}"
             onclick="return confirm('Do you really want to remove this comment?');"
             title="Remove comment">