diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 3447c2b6b..a99632867 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -1,3 +1,8 @@
+- name: Turn off hostapd when no wifi interface present or in "Appliance Mode"
+  set_fact:
+    hostapd_enabled: False
+  when: not iiab_wireless_lan_iface is defined or iiab_network_mode == "Appliance"
+
 - name: Create /etc/hostapd/hostapd.conf from template
   template:
     src: hostapd/hostapd.conf.j2
@@ -5,16 +10,16 @@
     owner: root
     group: root
     mode: 0644
-  when: iiab_wireless_lan_iface is defined
+  when: discovered_wireless_iface != "none"
 
-- name: Create /etc/hostapd/hostapd.conf.iiab from template
+- name: Create backup /etc/hostapd/hostapd.conf.iiab from template
   template:
     src: hostapd/iiab-hostapd.conf.j2
     dest: /etc/hostapd/hostapd.conf.iiab
     owner: root
     group: root
     mode: 0644
-  when: discovered_wireless_iface is defined
+  when: discovered_wireless_iface != "none"
 
 - name: Use custom systemd unit file to start 'hostapd' service
   template:
@@ -23,6 +28,7 @@
     owner: root
     group: root
     mode: 0644
+  when: discovered_wireless_iface != "none"
 
 - name: Create /usr/bin/iiab-hotspot-on from template
   template:
@@ -53,7 +59,7 @@
   systemd:
     name: hostapd
     enabled: yes
-  when: hostapd_enabled and iiab_wireless_lan_iface is defined and iiab_network_mode != "Appliance"
+  when: hostapd_enabled
 
 - name: Record HOSTAPD_ENABLED to {{ iiab_env_file }}
   lineinfile: