diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e5ba829..cdb82f9 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -154,6 +154,7 @@ jobs:
         FIXED_BRANCH: ${{ github.head_ref }}-spotless-fixes
 
     - name: Run server for up to ${{ inputs.timeout }} seconds
+      id: run_server
       if: ${{ !inputs.client-only }}
       shell: bash
       env:
@@ -198,7 +199,7 @@ jobs:
         timeout ${{ inputs.timeout }} ./gradlew "${gradle_args[@]}" 2>&1 < "${server_stdin}" | tee -a server.log || true
 
     - name: Upload Horizon-QA reports
-      if: ${{ always() && !inputs.client-only && inputs.horizonqa }}
+      if: ${{ always() && !inputs.client-only && inputs.horizonqa && steps.run_server.conclusion != 'skipped' }}
       uses: actions/upload-artifact@v7
       continue-on-error: true
       with:
@@ -207,7 +208,7 @@ jobs:
         retention-days: 90
 
     - name: Summarize Horizon-QA result
-      if: ${{ always() && !inputs.client-only && inputs.horizonqa }}
+      if: ${{ always() && !inputs.client-only && inputs.horizonqa && steps.run_server.conclusion != 'skipped' }}
       shell: bash
       continue-on-error: true
       run: |
@@ -215,7 +216,7 @@ jobs:
         .gtnh-workflows/scripts/summarize_horizonqa_result
 
     - name: Test Horizon-QA result
-      if: ${{ always() && !inputs.client-only && inputs.horizonqa }}
+      if: ${{ always() && !inputs.client-only && inputs.horizonqa && steps.run_server.conclusion != 'skipped' }}
       shell: bash
       run: |
         chmod +x .gtnh-workflows/scripts/test_horizonqa_result