diff --git a/roles/base/tasks/system_setup/hostname.yml b/roles/base/tasks/system_setup/hostname.yml
index ac58557..5dd2faf 100644
--- a/roles/base/tasks/system_setup/hostname.yml
+++ b/roles/base/tasks/system_setup/hostname.yml
@@ -1,3 +1,4 @@
 - name: base | system_setup | hostname
   hostname:
-    name: "{{ hostname }}"
\ No newline at end of file
+    name: "{{ hostname }}"
+  when: hostname is defined
\ No newline at end of file