diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index d1928bdb2..5ff95f432 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -27,7 +27,7 @@
 # hostapd_enabled: True
 # Above set in /opt/iiab/iiab/vars/default_vars.yml
 
-hostapd_wait: 5
+hostapd_wait: 10
 host_wireless_n: False
 driver_name: nl80211
 ap0_mac_addr: b8:27:99:12:34:56
diff --git a/roles/network/templates/hostapd/50-hostapd b/roles/network/templates/hostapd/50-hostapd
index d1ab4ea7e..601f8660a 100644
--- a/roles/network/templates/hostapd/50-hostapd
+++ b/roles/network/templates/hostapd/50-hostapd
@@ -26,7 +26,7 @@ if [ "$interface" = "wlan0" ]; then
     fi
     # spams the logging
     #syslog info "50-iiab set ap0 spam $REASON"
-    if [ -e /sys/class/net/ap0 ] && [ "$reason" = "BOUND" ]; then
+    if [ -e /sys/class/net/ap0 ] && ([ "$reason" = "CARRIER" ] || [ "$reason" = "NOCARRIER" ] || [ "$reason" = "BOUND" ]); then
         syslog info "50-iiab set ap0 up $REASON"
         # keeps ap0 up so hostapd works
         ip link set ap0 up