diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml
index e5fa9e7c8..e7ee8df90 100644
--- a/.github/workflows/auto-comment.yml
+++ b/.github/workflows/auto-comment.yml
@@ -60,7 +60,7 @@ jobs:
               });
             } else if ((context.eventName === 'pull_request' || context.eventName === 'pull_request_target') && context.payload.action === 'opened') {
               github.rest.issues.createComment({
-                issue_number: context.issue.number,
+                issue_number: context.payload.pull_request.number,
                 owner,
                 repo,
                 body: `Woohoo @${author}! 🎉 You've just dropped some hot new code! 🔥
@@ -90,9 +90,9 @@ jobs:
               }
 
               github.rest.issues.createComment({
-                issue_number: context.issue.number,
+                issue_number: context.payload.pull_request.number,
                 owner,
                 repo,
                 body: commentBody
               });
-            }
\ No newline at end of file
+            }