diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 3df0f2c36..7f5bd34a4 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -12,7 +12,7 @@
 - name: Detect current Wifi channel
   shell: iw {{ discovered_wireless_iface }} info | grep channel | cut -d' ' -f2
   register: current_client_channel
-  when: discovered_wireless_iface != "none"
+  when: has_wifi_gateway is defined
 
 - name: Setting WiFi channel to {{ current_client_channel.stdout }}
   set_fact: