diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 845aa6109..f017e1c70 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -6,8 +6,8 @@ on:
 
 concurrency:
   # Cancel in progress for PR open and close, but not merge_group
-  group: ${{ github.workflow }}-${{ github.event.number }}
-  cancel-in-progress: ${{ !github.event.number && false || true }}
+  group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }}
+  cancel-in-progress: true
 
 jobs:
   # PR only, skip for merge_group