diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index f8b522e9b4..1fdf15bb96 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -16,6 +16,7 @@
     queue_name: "{{ app }}{{ env_suffix }}"
     routing_keys: []
     message_ttl: 60000
+    when: not 'infra issue https://pagure.io/fedora-infrastructure/issue/8235 is fixed'
 
   - openshift/project