diff --git a/debian/changelog b/debian/changelog
index 625c2ec..54fa256 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+raspi-config (20200727) buster; urgency=medium
+
+  * Disable initial rfkill for all platforms when setting wireless country
+
+ -- Simon Long <simon@raspberrypi.com>  Mon, 27 Jul 2020 15:47:29 +0100
+
 raspi-config (20200707) buster; urgency=medium
 
   * Add boot ROM and boot order selection
diff --git a/raspi-config b/raspi-config
index b9aeaa9..27c8cea 100755
--- a/raspi-config
+++ b/raspi-config
@@ -559,9 +559,11 @@ do_wifi_country() {
     fi
     if hash rfkill 2> /dev/null; then
       rfkill unblock wifi
-      for filename in /var/lib/systemd/rfkill/*:wlan ; do
-        echo 0 > $filename
-      done
+      if is_pi ; then
+        for filename in /var/lib/systemd/rfkill/*:wlan ; do
+          echo 0 > $filename
+        done
+      fi
     fi
     if [ "$INTERACTIVE" = True ]; then
         whiptail --msgbox "Wireless LAN country set to $COUNTRY" 20 60 1