diff --git a/ansible/roles/nomad_client/tasks/client_setup.yml b/ansible/roles/nomad_client/tasks/client_setup.yml
index 28876fa..faa31f6 100644
--- a/ansible/roles/nomad_client/tasks/client_setup.yml
+++ b/ansible/roles/nomad_client/tasks/client_setup.yml
@@ -5,6 +5,7 @@
     gid: "{{ item.id }}"
     system: True
   loop: "{{ nomad_ug_map }}"
+  when: nomad_ug_map is defined
 
 - name: setup user mappings
   user:
@@ -12,6 +13,7 @@
     uid: "{{ item.id }}"
     system: True
   loop: "{{ nomad_ug_map }}"
+  when: nomad_ug_map is defined
 
 - name: ensure mounts
   file:
@@ -21,4 +23,5 @@
     group: "{{ item.owner }}"
     mode: 0755
   loop: "{{ nomad_bind_mounts }}"
+  when: nomad_bind_mounts is defined
 ...