diff --git a/.github/workflows/screenshot-test-comment.yml b/.github/workflows/screenshot-test-comment.yml
index 39d259633f..caef881de5 100644
--- a/.github/workflows/screenshot-test-comment.yml
+++ b/.github/workflows/screenshot-test-comment.yml
@@ -24,6 +24,8 @@ jobs:
         run: sleep 120
 
       - name: Wait for Screenshot Tests to complete
+        id: wait-for-screenshot-tests
+        continue-on-error: true
         uses: lewagon/wait-on-check-action@9312864dfbc9fd208e9c0417843430751c042800 # v1.7.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -72,6 +74,8 @@ jobs:
 
             if (!screenshotTestRun) {
               console.log('Screenshot test job not found');
+              core.notice('Run Screenshot Tests check was not found. The build workflow may be waiting for maintainer approval.');
+              core.setOutput('failed', 'false');
               return;
             }