diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index 0ff8105..4774406 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -75,7 +75,8 @@ jobs:
               run: |
                   echo "config-args=--nightly '${{ inputs.version }}'" >> $GITHUB_OUTPUT
 
-            - name: Build App
+            # We split these because electron-builder gets upset if we set CSC_LINK even to an empty string
+            - name: '[Signed] Build App'
               run: |
                   scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }}
                   yarn build:universal --publish never --config electron-builder.json
@@ -85,7 +86,13 @@ jobs:
                   NOTARIZE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
                   CSC_KEY_PASSWORD: ${{ secrets.APPLE_CSC_KEY_PASSWORD }}
                   CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
-                  CSC_IDENTITY_AUTO_DISCOVERY: ${{ inputs.sign || 'false' }}
+
+            - name: '[Unsigned] Build App'
+              run: |
+                  scripts/generate-builder-config.ts ${{ steps.nightly.outputs.config-args }}
+                  yarn build:universal --publish never --config electron-builder.json
+              env:
+                  CSC_IDENTITY_AUTO_DISCOVERY: false
 
             - name: Prepare artifacts for deployment
               if: inputs.deploy-mode