diff --git a/playbooks/zuul/run-production-playbook-post.yaml b/playbooks/zuul/run-production-playbook-post.yaml
index 4c563784ad..137c93afd9 100644
--- a/playbooks/zuul/run-production-playbook-post.yaml
+++ b/playbooks/zuul/run-production-playbook-post.yaml
@@ -5,7 +5,9 @@
 - hosts: prod_bastion[0]
   tasks:
     - name: Encrypt log
-      when: infra_prod_playbook_encrypt_log|default(False)
+      when: >
+          infra_prod_playbook_encrypt_log|default(False) and
+          (not infra_prod_playbook_collect_log)
       block:
 
         - name: Create temporary staging area for encrypted logs