diff --git a/roles/network/templates/hostapd/50-hostapd b/roles/network/templates/hostapd/50-hostapd
index 589a257cb..8697c283d 100644
--- a/roles/network/templates/hostapd/50-hostapd
+++ b/roles/network/templates/hostapd/50-hostapd
@@ -13,7 +13,7 @@ if [ "$interface" = "wlan0" ]; then
                 FREQ2=$result
             fi
         done
-        echo "Using $FREQ2 for $SSID"
+        echo "Using $FREQ2 for carrier"
         syslog info "50-iiab set channel $FREQ2"
         HOSTAPD=`grep channel /etc/hostapd/hostapd.conf | awk -F = '{print $2}'`
         echo "Hostapd set for $HOSTAPD"
diff --git a/roles/network/templates/hostapd/netd-disp2 b/roles/network/templates/hostapd/netd-disp2
index 35645e65d..78e258627 100644
--- a/roles/network/templates/hostapd/netd-disp2
+++ b/roles/network/templates/hostapd/netd-disp2
@@ -1,28 +1,21 @@
 #!/bin/bash
 if [ "$IFACE" == "{{ discovered_wireless_iface }}" ]; then
     echo "NET-DISP-WiFi $IFACE $STATE"
-    FREQ=`wpa_cli -i $IFACE scan_results | grep : | awk '{print $2}'`
-    for result in $FREQ; do
-        echo "frequency is $result for carrier"
-        if [ $result -lt 2485 ] && [ ! -z $result ]; then
-            FREQ2=$result
-        else
-            FREQ2="NA"
-        fi
-    done
-    echo "Using $FREQ2 for carrier"
-    CHAN=$(($FREQ2 - 2407 ))
-    CHAN=$(($CHAN / 5 ))
+    # If we are here we have a dhcp ip address
+    CHAN=`iw $IFACE info|grep channel|cut -d' ' -f2`
     echo "Using channel $CHAN for carrier"
     HOSTAPD=`grep channel /etc/hostapd/hostapd.conf | awk -F = '{print $2}'`
     echo "Hostapd set for $HOSTAPD"
-    if [ $CHAN -ne $HOSTAPD ] && [[ ! $FREQ2 == "NA" ]]; then
+    if [ $CHAN -ne $HOSTAPD ] && [ $CHAN -lt 14 ]; then
         echo "Editing Hostapd for channel $CHAN"
         cp /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
         sed -i -e "s/^channel.*/channel=$CHAN/" /etc/hostapd/hostapd.conf
         systemctl stop wpa_supplicant
         systemctl restart hostapd
         systemctl start wpa_supplicant
+    else
+        echo "Upstream Channel greater than 13 or is the same - not changing hostapd.conf"
     fi
+    sleep 3
     /usr/sbin/ip link set ap0 up
 fi