diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 105d8eebf5..0a0bbeb5b1 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -229,7 +229,7 @@ jobs:
   FTPUpload:
     name: 📦 FTP Upload Artifacts
     runs-on: [ self-hosted, Linux, Docker ]
-    if: always() && !inputs.is_called_workflow
+    if: ${{ !cancelled() && !inputs.is_called_workflow}}
     needs:
       # All jobs that create new artifacts
       - BuildInstaller
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 6050f3d021..74bd7372fe 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -126,7 +126,7 @@ jobs:
   FTPUpload:
     name: 📦 FTP Upload Artifacts
     runs-on: [ self-hosted, Linux, Docker ]
-    if: always()
+    if: ${{ !cancelled() }}
     needs:
       # All jobs that create new artifacts
       - CallPR