diff --git a/.github/workflows/codebuild-ci.yml b/.github/workflows/codebuild-ci.yml
index d0818ea30d36..d6e7b4d9840e 100644
--- a/.github/workflows/codebuild-ci.yml
+++ b/.github/workflows/codebuild-ci.yml
@@ -145,7 +145,7 @@ jobs:
             const getComments = 
               `query { 
                 repository(owner:"${context.repo.owner}", name:"${context.repo.repo}"){
-                  pullRequest(number: ${context.issue.number}) {
+                  pullRequest(number: ${context.issue.number ?? process.env.SDK_PR}) {
                     id
                     comments(last:100) {
                       nodes {