diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 346554d1c7..e03661c242 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -96,10 +96,6 @@ jobs:
   - publish: CompiledSamples
     artifact: Samples ($(TARGET))
   - script: |
-      if [ -z "$CACHIX_AUTH_TOKEN" ]; then
-        echo "Token for cachix access not available, skipping."
-        exit
-      fi
       docker start nix -i <<EOF
           export CACHIX_AUTH_TOKEN=$CACHIX_AUTH_TOKEN
           cd src
@@ -110,6 +106,7 @@ jobs:
     displayName: Push to Cachix
     env:
       CACHIX_AUTH_TOKEN: $(CACHIX_AUTH_TOKEN)
+    condition: ne(variables['CACHIX_AUTH_TOKEN'], '')
 
 
 - job: NixMac
@@ -142,10 +139,6 @@ jobs:
       nix-build -A $(TARGET).retro68.samples
     displayName: build
   - script: |
-      if [ -z "$CACHIX_AUTH_TOKEN" ]; then
-        echo "Token for cachix access not available, skipping."
-        exit
-      fi
       . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
       export CACHIX_AUTH_TOKEN=$CACHIX_AUTH_TOKEN
       nix-build -A $(TARGET).retro68.samples | cachix push autc04
@@ -154,3 +147,5 @@ jobs:
     displayName: Push to Cachix
     env:
       CACHIX_AUTH_TOKEN: $(CACHIX_AUTH_TOKEN)
+    condition: ne(variables['CACHIX_AUTH_TOKEN'], '')
+