diff --git a/evolinux-base/tasks/hostname.yml b/evolinux-base/tasks/hostname.yml
index bddc3450..6a693b6b 100644
--- a/evolinux-base/tasks/hostname.yml
+++ b/evolinux-base/tasks/hostname.yml
@@ -2,6 +2,7 @@
 - name: Set hostname "{{ evolinux_hostname }}"
   hostname:
     name: "{{ evolinux_hostname }}"
+  when: evolinux_hostname_hosts
 
 - name: Set right localhost line in /etc/hosts
   replace: