diff --git a/olam/olam_passwordless_setup.yml b/olam/olam_passwordless_setup.yml
index d44f842..d9cec83 100644
--- a/olam/olam_passwordless_setup.yml
+++ b/olam/olam_passwordless_setup.yml
@@ -29,7 +29,9 @@
     key: "{{ lookup('file', 'buffer/{{ item }}-id_rsa.pub') }}"
   loop: "{{ groups['control'] | flatten(levels=1) }}"
   become: true
-  when: inventory_hostname in groups['remote']
+  when: 
+   - inventory_hostname in groups['remote']
+   - "'remote' in groups"
 
 - name: Print hostvars for groups
   ansible.builtin.debug: