diff --git a/roles/network/templates/hostapd/iiab-test-wifi.j2 b/roles/network/templates/hostapd/iiab-test-wifi.j2
index 2370c152f..e358d4dbb 100755
--- a/roles/network/templates/hostapd/iiab-test-wifi.j2
+++ b/roles/network/templates/hostapd/iiab-test-wifi.j2
@@ -26,17 +26,22 @@ fi
 # https://bugs.launchpad.net/ubuntu/+source/linux-firmware/+bug/1862760
 # https://bugs.launchpad.net/netplan/+bug/1951586
 # WiFi country code progress on arm64 OS's discussed on #3078
-if [ -f /run/netplan/wpa-$IFACE.conf ] && $(grep country /run/netplan/wpa-$IFACE.conf); then
-    REG_DOM=$(grep country /run/netplan/wpa-$IFACE.conf | awk -F = '{ print $2 }')
-    sed -i -e "s/^country.*/country=$REG_DOM/" /etc/hostapd/hostapd.conf.iiab
-    cp /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
-else
-    NETPLAN=1
+if [ -f /run/netplan/wpa-$IFACE.conf ]; then
     SSID=`grep ssid /run/netplan/wpa-$IFACE.conf | awk -F = '{print $2}' | sed -r s/\"// | sed -r s/\"//`
-    echo "cover netplan lack of country="
-    sed -i 's|ctrl_interface=/run/wpa_supplicant|&\ncountry={{ host_country_code }}|' /run/netplan/wpa-$IFACE.conf
-
+    REG_DOM=$(grep country /run/netplan/wpa-$IFACE.conf | awk -F = '{ print $2 }')
+    if [ -z "$REG_DOM" ]; then
+        NETPLAN=1
+        echo "cover netplan wifi client lack of country="
+        sed -i 's|ctrl_interface=/run/wpa_supplicant|&\ncountry={{ host_country_code }}|' /run/netplan/wpa-$IFACE.conf
+    else
+        echo "set hostapd wifi country to $REG_DOM"
+        if [ -f /etc/hostapd/hostapd.conf.iiab ]; then
+            sed -i 's|^country.*|country=$REG_DOM|' /etc/hostapd/hostapd.conf.iiab
+            cp /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
+        fi
+    fi
 fi
+
 # IIAB hint for NetworkManager
 # could scrape /etc/NetworkManager/system-connections/ looking for ssid
 if [ -f /etc/iiab/iiab.env ]; then