diff --git a/tasks/onserver.yml b/tasks/onserver.yml
index df704598c065571572cb3a5cafcb6938440e1a10..83eb052a2dd61ec8e0cad6babdfb303b2fcf0aad 100644
--- a/tasks/onserver.yml
+++ b/tasks/onserver.yml
@@ -38,11 +38,11 @@
     mode: 0700
     state: directory
   with_items:
-    - "{{ hostvars[borgbackup_target_host]['borgbackup_pool'] }}"
-    - "{{ hostvars[borgbackup_target_host]['borgbackup_pool'] }}/{{ borgbackup_source_host }}"
+    - "{{ hostvars[borgbackup_target_host]['borgbackup_pool'] | default(borgbackup_pool) }}"
+    - "{{ hostvars[borgbackup_target_host]['borgbackup_pool'] | default(borgbackup_pool) }}/{{ borgbackup_source_host }}"
 
 - name: Add public key
   authorized_key:
     user: "borgbackup"
     key: "{{borgbackup_source_key}}"
-    key_options: "command=\"cd {{ hostvars[borgbackup_target_host]['borgbackup_pool'] }}/{{ borgbackup_source_host }};borg serve --restrict-to-path {{ hostvars[borgbackup_target_host]['borgbackup_pool'] }}/{{ borgbackup_source_host }}\",restrict"
+    key_options: "command=\"cd {{ hostvars[borgbackup_target_host]['borgbackup_pool'] | default(borgbackup_pool) }}/{{ borgbackup_source_host }};borg serve --restrict-to-path {{ hostvars[borgbackup_target_host]['borgbackup_pool'] | default(borgbackup_pool) }}/{{ borgbackup_source_host }}\",restrict"