diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 8800edc95..5ce1ff2e2 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -4,10 +4,10 @@
     enabled: no
     masked: no
 
-- name: Disable hostapd when not using ap0 and wifi gateway present
+- name: Disable hostapd when not using ap0 and wifi gateway present or no WiFi hardware present
   set_fact:
     hostapd_enabled: False
-  when: not wifi_up_down and discovered_wireless_iface == iiab_wan_iface
+  when: (not wifi_up_down and discovered_wireless_iface == iiab_wan_iface) or discovered_wireless_iface == "none"
 
 - name: Detect current Wifi channel
   shell: iw {{ discovered_wireless_iface }} info | grep channel | cut -d' ' -f2