diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 2886ceb6..b2c99288 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -2184,17 +2184,22 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
       return true;
     }
     if (strcmp(command, "get wifi.ssid") == 0) {   // no 'get wifi.pwd', by design
-      sprintf(reply, "> %s", _prefs.wifi_ssid[0] ? _prefs.wifi_ssid : WIFI_SSID);
+      sprintf(reply, "> %s", _prefs.wifiSSID()[0] ? _prefs.wifiSSID() : "(not set)");
       return true;
     }
     if (memcmp(command, "set wifi.enabled ", 17) == 0) {
-      _prefs.wifi_enabled = atoi(&command[17]) ? 1 : 0;
+      uint8_t en = atoi(&command[17]) ? 1 : 0;
+      if (en && !_prefs.wifiSSID()[0]) {
+        strcpy(reply, "> set wifi.ssid first");
+        return true;
+      }
+      _prefs.wifi_enabled = en;
       savePrefs();
-      sprintf(reply, "> wifi.enabled is now %d (reboot to apply)", _prefs.wifi_enabled);
+      sprintf(reply, "> wifi.enabled is now %d (reboot to apply)", en);
       return true;
     }
     if (strcmp(command, "get wifi.enabled") == 0) {
-      sprintf(reply, "> %d", _prefs.wifi_enabled);
+      sprintf(reply, "> %d", _prefs.wifiEnabled() ? 1 : 0);
       return true;
     }
     if (strcmp(command, "get wifi.status") == 0) {
diff --git a/examples/companion_radio/NodePrefs.h b/examples/companion_radio/NodePrefs.h
index 68facfbe..85cdebb2 100644
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -47,7 +47,12 @@ public:
 #ifdef WIFI_SSID
   char wifi_ssid[33] = {0};   // if empty, the compile-time WIFI_SSID is used
   char wifi_pwd[64] = {0};
-  uint8_t wifi_enabled = 0;   // off until 'set wifi.enabled 1' (credentials may still be baked in)
+  uint8_t wifi_enabled = 2;   // 0 = off, 1 = on, 2 = never set (treated as on)
+
+  // effective SSID: stored prefs win over the build-time one
+  const char* wifiSSID() const { return wifi_ssid[0] ? wifi_ssid : WIFI_SSID; }
+  // WiFi runs only when there is an SSID and it hasn't been explicitly turned off
+  bool wifiEnabled() const { return wifiSSID()[0] && wifi_enabled != 0; }
 #endif
 
 private:
diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp
index cf761095..d461a36d 100644
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -218,8 +218,8 @@ void setup() {
     strcpy(wifi_ssid, the_mesh.getNodePrefs()->wifi_ssid);
     strcpy(wifi_pwd, the_mesh.getNodePrefs()->wifi_pwd);
   }
-  // 'set wifi.enabled 0' or a build with blank credentials leaves the radio off entirely
-  wifi_enabled = the_mesh.getNodePrefs()->wifi_enabled && wifi_ssid[0];
+  // 'set wifi.enabled 0', or no SSID from either prefs or the build, leaves the radio off entirely
+  wifi_enabled = the_mesh.getNodePrefs()->wifiEnabled();
   if (wifi_enabled) {
 #if defined(ESP32)
     board.setInhibitSleep(true);   // prevent sleep when WiFi is active
diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini
index e54d86a6..763c96bc 100644
--- a/variants/rpi_picow/platformio.ini
+++ b/variants/rpi_picow/platformio.ini
@@ -94,8 +94,8 @@ build_flags = ${rpi_picow.build_flags}
   -D BLE_PIN_CODE=123456
 ; NOTE: DO NOT ENABLE -->  -D BLE_DEBUG_LOGGING=1   (shares Serial with the USB interface)
 ; NOTE: DO NOT ENABLE -->  -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"mypwd"'
+  -D WIFI_SSID='""'   ; no default network, configure with 'set wifi.ssid' / 'set wifi.pwd'
+  -D WIFI_PWD='""'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${rpi_picow.build_src_filter}
@@ -111,8 +111,8 @@ build_flags = ${rpi_picow.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"mypwd"'
+  -D WIFI_SSID='""'   ; no default network, configure with 'set wifi.ssid' / 'set wifi.pwd'
+  -D WIFI_PWD='""'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${rpi_picow.build_src_filter}