diff --git a/.github/workflows/evals.yml b/.github/workflows/evals.yml
index d336daf6f..2e61ded5d 100644
--- a/.github/workflows/evals.yml
+++ b/.github/workflows/evals.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: evals-${{ github.head_ref }}
+  group: evals-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/make-pdf-gate.yml b/.github/workflows/make-pdf-gate.yml
index cd07e26bc..8162acc6b 100644
--- a/.github/workflows/make-pdf-gate.yml
+++ b/.github/workflows/make-pdf-gate.yml
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: make-pdf-gate-${{ github.head_ref }}
+  group: make-pdf-gate-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/windows-free-tests.yml b/.github/workflows/windows-free-tests.yml
index c05a7d002..8c8fa9493 100644
--- a/.github/workflows/windows-free-tests.yml
+++ b/.github/workflows/windows-free-tests.yml
@@ -28,7 +28,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: windows-free-${{ github.head_ref }}
+  group: windows-free-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/windows-setup-e2e.yml b/.github/workflows/windows-setup-e2e.yml
index ddc5051af..9c7e763c4 100644
--- a/.github/workflows/windows-setup-e2e.yml
+++ b/.github/workflows/windows-setup-e2e.yml
@@ -26,7 +26,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: windows-setup-e2e-${{ github.head_ref }}
+  group: windows-setup-e2e-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs: