diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index dd1855d22..98fc09114 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -59,14 +59,14 @@
 
 - name: Checking if WiFi slave is active
   shell: brctl show br0 | grep {{ iiab_wireless_lan_iface }} | wc -l
-  when: iiab_wireless_lan_iface is defined and iiab_lan_iface == "br0" and hostapd_enabled
+  when: hostapd_enabled and iiab_wireless_lan_iface is defined and iiab_lan_iface == "br0"
   register: wifi_slave
 
 - name: Restart hostapd if WiFi slave is inactive
   service:
     name: hostapd.service
     state: restarted
-  when: hostapd_enabled and not manually_toggle_AP and wifi_slave.stdout is defined and wifi_slave.stdout == 0
+  when: hostapd_enabled and wifi_slave.stdout is defined and wifi_slave.stdout == 0
 
 - name: dhcp_server may be affected - starting - user choice
   service: