diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index c09b7e8e9..feb2f5523 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -1,7 +1,7 @@
-- name: Turn off hostapd when no wifi interface present or in "Appliance Mode"
+- name: Turn off hostapd when not using ap0 and wifi gateway present
   set_fact:
     hostapd_enabled: False
-  when: iiab_wireless_lan_iface is undefined or iiab_network_mode == "Appliance"
+  when: not wifi_up_down and discovered_wireless_iface == iiab_wan_iface
 
 - name: Detect current Wifi channel
   shell: iw {{ discovered_wireless_iface }} info | grep channel | cut -d' ' -f2