diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 0634bdc63..6cecec5c4 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -2,7 +2,8 @@
   systemd:
     name: hostapd
     state: restarted
-  when: iiab_wireless_lan_iface is defined and hostapd_enabled and discovered_wireless_iface != iiab_wan_iface
+#  when: iiab_wireless_lan_iface is defined and hostapd_enabled and discovered_wireless_iface != iiab_wan_iface
+  when: hostapd_enabled and iiab_wireless_lan_iface is defined and discovered_wireless_iface == iiab_wireless_lan_iface
 
 - name: Start named service
   systemd:
@@ -79,6 +80,6 @@
   systemd:
     name: "{{ dhcp_service2 }}"
     state: restarted
-  when: not no_net_restart
+  when: not no_net_restart and discovered_wireless_iface == "none"
   #when: (iiab_network_mode != "Appliance")    # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab
   #when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface