diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 031fa35..44444d0 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -297,7 +297,14 @@ jobs:
               gh pr edit "$PR_NUM" \
                 --add-label "awaiting-changes" \
                 --remove-label "awaiting-review" >/dev/null 2>&1 || true
-            elif label_exists_any "awaiting-changes" && ! label_exists_any "awaiting-upstream" "work-in-progress" "pr-check-blocked" "blocked" && [ "$PR_THREAD_COUNT" -eq 0 ]; then
+            elif label_exists_any "awaiting-changes" \
+              && ! label_exists_any \
+                   "awaiting-upstream" \
+                   "work-in-progress" \
+                   "pr-check-blocked" \
+                   "blocked" \
+              && if ! comment_exists_any "$BUILD_SUCCESS_COMMENT" \
+              && [ "$PR_THREAD_COUNT" -eq 0 ]; then
               echo "No review comments, ensuring awaiting-review label"
               gh pr edit "$PR_NUM" \
                 --add-label "awaiting-review" \