diff --git a/roles/vault/tasks/shared/issue_cert.yml b/roles/vault/tasks/shared/issue_cert.yml
index 786112d24..3ea6733b3 100644
--- a/roles/vault/tasks/shared/issue_cert.yml
+++ b/roles/vault/tasks/shared/issue_cert.yml
@@ -39,7 +39,6 @@
       ip_sans: "{{ issue_cert_ip_sans | default([]) | join(',') }}"
   register: issue_cert_result
   when:
-    - inventory_hostname in play_hosts
     - inventory_hostname == issue_cert_hosts|first
 
 - name: issue_cert | Copy the cert to all hosts
@@ -50,7 +49,6 @@
     mode: "{{ issue_cert_file_mode | d('0644') }}"
     owner: "{{ issue_cert_file_owner | d('root') }}"
   when:
-    - inventory_hostname in play_hosts
     - inventory_hostname == issue_cert_hosts|first
 
 - name: issue_cert | Copy the key to all hosts
@@ -61,7 +59,6 @@
     mode: "{{ issue_cert_file_mode | d('0640') }}"
     owner: "{{ issue_cert_file_owner | d('root') }}"
   when:
-    - inventory_hostname in play_hosts
     - inventory_hostname == issue_cert_hosts|first
 
 - name: issue_cert | Copy issuing CA cert
@@ -72,6 +69,5 @@
     mode: "{{ issue_cert_file_mode | d('0644') }}"
     owner: "{{ issue_cert_file_owner | d('root') }}"
   when:
-    - inventory_hostname in play_hosts
     - inventory_hostname == issue_cert_hosts|first
     - issue_cert_copy_ca|default(false)