diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml
index ee7b395d0..a3190ce5e 100644
--- a/roles/network/tasks/enable_services.yml
+++ b/roles/network/tasks/enable_services.yml
@@ -1,3 +1,8 @@
+- name: Disable the Access Point 'hostapd' service
+  service: enabled=no
+           name=hostapd.service
+  when: not iiab_wireless_lan_iface is defined or iiab_network_mode == "Appliance" or not hostapd_enabled
+
 - name: Disable dhcpd service
   service: name=dhcpd
            enabled=no