diff --git a/.github/workflows/optional-e2e.yml b/.github/workflows/optional-e2e.yml
index ffe170e70231..f73eaa256fc0 100644
--- a/.github/workflows/optional-e2e.yml
+++ b/.github/workflows/optional-e2e.yml
@@ -5,9 +5,6 @@ run-name: Optional E2E tests for ${{ inputs.commit }} (${{ inputs.correlation_id
 # does not count failed checks of a dispatched run in the PR status, so these failures do not mark
 # the PR as failed.
 on:
-  # Only here so that GitHub registers this workflow before it is on the default branch, which a
-  # dispatch needs. The job is skipped for this event. Remove this trigger after the merge.
-  pull_request:
   workflow_dispatch:
     inputs:
       commit:
@@ -40,7 +37,6 @@ env:
 jobs:
   job_optional_e2e_tests:
     name: E2E ${{ matrix.label || matrix.test-application }} Test (optional)
-    if: github.event_name == 'workflow_dispatch'
     # Same cache volume as the E2E jobs in build.yml. The event is always `workflow_dispatch`, so the PR number
     # decides if the run gets the PR volume.
     runs-on:
@@ -76,8 +72,7 @@ jobs:
       pnpm_config_verify_deps_before_run: 'false'
     strategy:
       fail-fast: false
-      # The fallback only keeps the expression valid for the skipped `pull_request` run.
-      matrix: ${{ fromJson(inputs.matrix || '{"include":[{}]}') }}
+      matrix: ${{ fromJson(inputs.matrix) }}
 
     steps:
       - name: Check out commit ${{ env.HEAD_COMMIT }}
@@ -122,7 +117,7 @@ jobs:
     name: Report in PR comment
     needs: [job_optional_e2e_tests]
     # Not for a cancelled run: a new push cancels the old run, and the new run reports.
-    if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' && inputs.pr_number != '' }}
+    if: ${{ !cancelled() && inputs.pr_number != '' }}
     runs-on: ubuntu-24.04
     timeout-minutes: 5
     permissions: