diff --git a/.github/workflows/comments.yml b/.github/workflows/comments.yml
index 3b7fc8bbd3b6..69a6768573d5 100644
--- a/.github/workflows/comments.yml
+++ b/.github/workflows/comments.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   comments_handler:
-    if: ${{ github.actor != 'bitnami-bot' && ((github.event.pull_request && (!contains(github.event.pull_request.labels.*.name, 'auto-merge'))) || github.event_name == 'issues') }}
+    if: ${{ github.actor != 'bitnami-bot' && ((github.event.pull_request && (!contains(github.event.pull_request.labels.*.name, 'auto-merge'))) || (github.event.issue && (!contains(github.event.issue.labels.*.name, 'auto-merge')))) }}
     runs-on: ubuntu-latest
     steps:
       - name: Repo checkout