diff --git a/.github/workflows/issue-comment.yml b/.github/workflows/issue-comment.yml
index 414cb42845..5388111d7c 100644
--- a/.github/workflows/issue-comment.yml
+++ b/.github/workflows/issue-comment.yml
@@ -7,7 +7,7 @@ name: Add issues workflow labels
 jobs:
   add-label-if-is-author:
     runs-on: ubuntu-latest
-    if: ${{ github.event.comment.pull_request.user.id == github.event.comment.user.id }} && ${{ !github.event.comment.pull_request.pull_request }}
+    if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
     steps:
       - name: Add require handle label
         uses: actions-cool/issues-helper@v2
@@ -23,7 +23,7 @@ jobs:
 
   add-label-if-not-author:
     runs-on: ubuntu-latest
-    if: ${{ github.event.comment.pull_request.user.id != github.event.comment.user.id }} && ${{ !github.event.comment.pull_request.pull_request }}
+    if: (github.event.issue.user.id != github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
     steps:
       - name: Add require replay label
         uses: actions-cool/issues-helper@v2