diff --git a/.github/workflows/release-comms.yml b/.github/workflows/release-comms.yml
index 6b39664dad0..6479457623e 100644
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -22,6 +22,7 @@ on:
 
 jobs:
   setup:
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/')) }}
     name: Setup and establish latest
     outputs:
       version: ${{ steps.output.outputs.version }}
@@ -35,7 +36,7 @@ jobs:
         echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
         echo "DRY_RUN=${{ inputs.dry_run }}" >> $GITHUB_ENV
         echo "LATEST=${{ inputs.latest }}" >> $GITHUB_ENV
-    - if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/')
+    - if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
       run: |
         echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\///g')" >> $GITHUB_ENV
         echo "DRY_RUN=true" >> $GITHUB_ENV