diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 3213a6612..5d35b6855 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -14,10 +14,10 @@
             mode=0644
   when: discovered_wireless_iface is defined
 
-- name: Disable the Access Point 'hostapd' service
-  service: enabled=no
+- name: Enable the Access Point 'hostapd' service
+  service: enabled=yes
            name=hostapd.service
-  when: not iiab_wireless_lan_iface is defined or iiab_network_mode == "Appliance" or not hostapd_enabled
+  when: iiab_wireless_lan_iface is defined and iiab_network_mode != "Appliance" and hostapd_enabled
 
 - name: Use custom systemd unit file to start 'hostapd' service
   template: src=hostapd/hostapd.service.j2