diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 8ac825472..fe535a41b 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -3,6 +3,16 @@
     hostapd_enabled: False
   when: iiab_wireless_lan_iface is undefined or iiab_network_mode == "Appliance"
 
+- name: Detect current Wifi channel
+  shell: iw {{ discovered_wireless_iface }} info | grep channel | cut -d' ' -f2
+  register: current_host_channel
+  when: discovered_wireless_iface != "none"
+
+- name: Setting WiFi channel to {{ current_host_channel.stdout }} on RPi hardware
+  set_fact:
+    host_channel: "{{ current_host_channel.stdout }}"
+  when: current_host_channel.stdout != "" and discovered_wireless_iface != "none" and rpi_model != "none"
+
 - name: Create /etc/hostapd/hostapd.conf from template
   template:
     src: hostapd/hostapd.conf.j2