diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
index 7a380e98..2d7d1491 100644
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -1,7 +1,7 @@
 #include "MyMesh.h"
 
 #include <Arduino.h> // needed for PlatformIO
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
 #include <WiFi.h>
 #endif
 #include <Mesh.h>
@@ -2160,7 +2160,7 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char*
     return true;
   }
 
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   if (memcmp(command, "set wifi.ssid ", 14) == 0) {
     StrHelper::strncpy(_prefs.wifi_ssid, &command[14], sizeof(_prefs.wifi_ssid));
     savePrefs();
@@ -2438,7 +2438,7 @@ void MyMesh::loop() {
     checkCLIRescueCmd();
   } else {
     checkSerialInterface();
-#if defined(WIFI_SSID) && defined(RP2040_PLATFORM) && !defined(ENABLE_USB_INTERFACE)
+#if defined(ENABLE_WIFI_INTERFACE) && defined(RP2040_PLATFORM) && !defined(ENABLE_USB_INTERFACE)
     // RP2040 WiFi builds are headless and have no way into the rescue CLI (that needs a
     // display + long-press), so serve config commands on the otherwise unused USB serial
     checkCLIRescueCmd();
diff --git a/examples/companion_radio/NodePrefs.h b/examples/companion_radio/NodePrefs.h
index ed408f9a..cf1914d0 100644
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -44,7 +44,10 @@ public:
   char default_scope_name[31];
   uint8_t default_scope_key[16];
   int8_t tz_offset = 0;
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
+  #ifndef WIFI_SSID
+    #define WIFI_SSID ""
+  #endif
   char wifi_ssid[33] = {0};   // if empty, the compile-time WIFI_SSID is used
   char wifi_pwd[64] = {0};
   uint8_t wifi_enabled = 1; // enabled by default to allow wifi only builds to work. wifi won't be started if ssid is empty
@@ -167,7 +170,7 @@ private:
 
   DynamicConfigSerializer custom;
 
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   class WiFiPrefs : public ConfigSerializer {
     NodePrefs* _parent;
   protected:
@@ -194,13 +197,13 @@ protected:
     def("repeat", repeat);
     def("comp", companion);
     def("custom", custom);
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
     def("wifi", wifi);
 #endif
   }
 public:
   NodePrefs() : radio(this), gps(this), companion(this), custom(&radio)
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
     , wifi(this)
 #endif
   {
diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp
index d886b804..6dc9acdc 100644
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -36,7 +36,13 @@ MultiSerialInterface interface_manager;
 #endif
 
 // include wifi interface
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
+  #ifndef WIFI_SSID
+    #define WIFI_SSID ""
+  #endif
+  #ifndef WIFI_PWD
+    #define WIFI_PWD ""
+  #endif
   #ifndef TCP_PORT
     #define TCP_PORT 5000
   #endif
@@ -121,7 +127,7 @@ void halt() {
 }
 
 /* WIFI RECONNECT TRACKERS */
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   bool wifi_needs_reconnect = false;
   unsigned long last_wifi_reconnect_attempt = 0;
   char wifi_ssid[33] = WIFI_SSID;   // replaced by stored prefs at boot, if set
@@ -208,7 +214,7 @@ void setup() {
 #endif
 
 // add wifi interface
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   // use wifi ssid and password from prefs if ssid is not empty, otherwise use the build flag defaults
   if (the_mesh.getNodePrefs()->wifi_ssid[0]) {
     strcpy(wifi_ssid, the_mesh.getNodePrefs()->wifi_ssid);
@@ -302,7 +308,7 @@ void loop() {
 #endif
   }
 
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   if (wifi_enabled) {
     // RP2040 has no WiFi event callbacks, so poll the link state instead
   #if defined(RP2040_PLATFORM)
diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp
index 2c79ab91..53ae480c 100644
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -3,7 +3,7 @@
 #include "../MyMesh.h"
 #include "target.h"
 #include <time.h>
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   #include <WiFi.h>
 #endif
 
@@ -260,7 +260,7 @@ public:
       sprintf(tmp, "%02d/%02d/%d", dt.day(), dt.month(), dt.year());
       display.drawTextCentered(display.width() / 2, 80, tmp);
       #endif
-      #ifdef WIFI_SSID
+      #ifdef ENABLE_WIFI_INTERFACE
         IPAddress ip = WiFi.localIP();
         snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
         display.setTextSize(1);
diff --git a/examples/companion_radio/ui-tiny/UITask.cpp b/examples/companion_radio/ui-tiny/UITask.cpp
index b6bdbcf4..9ecd66f1 100644
--- a/examples/companion_radio/ui-tiny/UITask.cpp
+++ b/examples/companion_radio/ui-tiny/UITask.cpp
@@ -4,7 +4,7 @@
 #include "target.h"
 #include "u8g2_icons.h"
 
-#ifdef WIFI_SSID
+#ifdef ENABLE_WIFI_INTERFACE
   #include <WiFi.h>
 #endif
 
@@ -173,7 +173,7 @@ public:
       display.setCursor(0, 19);
       display.print(tmp);
 
-      #ifdef WIFI_SSID
+      #ifdef ENABLE_WIFI_INTERFACE
         IPAddress ip = WiFi.localIP();
         snprintf(tmp, sizeof(tmp), "IP: %d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
         display.setTextSize(1);
diff --git a/variants/heltec_rc32/platformio.ini b/variants/heltec_rc32/platformio.ini
index df986cf0..2f07c021 100644
--- a/variants/heltec_rc32/platformio.ini
+++ b/variants/heltec_rc32/platformio.ini
@@ -173,6 +173,7 @@ extends = Heltec_RC32
 build_flags =
   ${Heltec_RC32.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D DISPLAY_CLASS=NullDisplayDriver
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
@@ -315,6 +316,7 @@ extends = Heltec_RC32_with_display
 build_flags =
   ${Heltec_RC32_with_display.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D UI_HAS_ROTARY_INPUT
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index 178508d8..5fd9edab 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -182,6 +182,7 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index 28e80554..6435936e 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -178,6 +178,7 @@ extends = Heltec_lora32_v2
 build_flags =
   ${Heltec_lora32_v2.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=160
   -D MAX_GROUP_CHANNELS=8
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index 27541a8a..a2b159ec 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -185,6 +185,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
@@ -341,6 +342,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini
index 25f9ee3b..96b3eec0 100644
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -228,6 +228,7 @@ extends = heltec_v4_oled
 build_flags =
   ${heltec_v4_oled.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
@@ -394,6 +395,7 @@ extends = heltec_v4_tft
 build_flags =
   ${heltec_v4_tft.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/heltec_v4_r8/platformio.ini b/variants/heltec_v4_r8/platformio.ini
index 8c2feb94..7611cc1c 100644
--- a/variants/heltec_v4_r8/platformio.ini
+++ b/variants/heltec_v4_r8/platformio.ini
@@ -175,6 +175,7 @@ extends = heltec_v4_r8_oled
 build_flags =
   ${heltec_v4_r8_oled.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
@@ -301,6 +302,7 @@ extends = heltec_v4_r8_tft
 build_flags =
   ${heltec_v4_r8_tft.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tbeam_1w/platformio.ini b/variants/lilygo_tbeam_1w/platformio.ini
index 16db0257..ab9c9e67 100644
--- a/variants/lilygo_tbeam_1w/platformio.ini
+++ b/variants/lilygo_tbeam_1w/platformio.ini
@@ -153,6 +153,7 @@ extends = LilyGo_TBeam_1W
 build_flags =
   ${LilyGo_TBeam_1W.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
index a9991f25..af4a8eaf 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -148,6 +148,7 @@ extends = T_Beam_S3_Supreme_SX1262
 build_flags =
   ${T_Beam_S3_Supreme_SX1262.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini
index cf24a5d5..dc60b6f7 100644
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -132,6 +132,7 @@ extends = LilyGo_TLora_V2_1_1_6
 build_flags =
   ${LilyGo_TLora_V2_1_1_6.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=160
   -D MAX_GROUP_CHANNELS=8
   -D WIFI_SSID='"ssid"'
diff --git a/variants/meshnology_w12/platformio.ini b/variants/meshnology_w12/platformio.ini
index c0e8c80d..ffab9d57 100644
--- a/variants/meshnology_w12/platformio.ini
+++ b/variants/meshnology_w12/platformio.ini
@@ -171,6 +171,7 @@ extends = meshnology_w12
 build_flags =
   ${meshnology_w12.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/nibble_screen_connect/platformio.ini b/variants/nibble_screen_connect/platformio.ini
index 3c5049e0..0f8d31de 100644
--- a/variants/nibble_screen_connect/platformio.ini
+++ b/variants/nibble_screen_connect/platformio.ini
@@ -143,6 +143,7 @@ extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
diff --git a/variants/nibble_zero_connect/platformio.ini b/variants/nibble_zero_connect/platformio.ini
index 9789eabf..c7e7b076 100644
--- a/variants/nibble_zero_connect/platformio.ini
+++ b/variants/nibble_zero_connect/platformio.ini
@@ -140,6 +140,7 @@ extends = nibble_zero_connect_base
 build_flags =
   ${nibble_zero_connect_base.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=300
   -D MAX_GROUP_CHANNELS=8
diff --git a/variants/rak3112/platformio.ini b/variants/rak3112/platformio.ini
index 2fee8c26..5f3b905b 100644
--- a/variants/rak3112/platformio.ini
+++ b/variants/rak3112/platformio.ini
@@ -172,6 +172,7 @@ extends = rak3112
 build_flags =
   ${rak3112.build_flags}
   -I examples/companion_radio/ui-orig
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini
index 763c96bc..9814f397 100644
--- a/variants/rpi_picow/platformio.ini
+++ b/variants/rpi_picow/platformio.ini
@@ -90,12 +90,11 @@ build_flags = ${rpi_picow.build_flags}
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D ENABLE_USB_INTERFACE
+  -D ENABLE_WIFI_INTERFACE
   -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH
   -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='""'   ; 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}
@@ -108,6 +107,7 @@ lib_deps = ${rpi_picow.lib_deps}
 [env:PicoW_companion_radio_wifi]
 extends = rpi_picow
 build_flags = ${rpi_picow.build_flags}
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index d8bdd5e8..c1ae765f 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -224,6 +224,7 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/station_g3_esp32/platformio.ini b/variants/station_g3_esp32/platformio.ini
index 477c135b..7006d939 100644
--- a/variants/station_g3_esp32/platformio.ini
+++ b/variants/station_g3_esp32/platformio.ini
@@ -139,6 +139,7 @@ extends = Station_G3_ESP32
 build_flags =
   ${Station_G3_ESP32.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini
index c1f5612a..862c7154 100644
--- a/variants/thinknode_m2/platformio.ini
+++ b/variants/thinknode_m2/platformio.ini
@@ -176,6 +176,7 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini
index f64e4e77..a3f348b3 100644
--- a/variants/thinknode_m5/platformio.ini
+++ b/variants/thinknode_m5/platformio.ini
@@ -190,6 +190,7 @@ extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/thinknode_m7/platformio.ini b/variants/thinknode_m7/platformio.ini
index 508fc813..5606d482 100644
--- a/variants/thinknode_m7/platformio.ini
+++ b/variants/thinknode_m7/platformio.ini
@@ -135,6 +135,7 @@ extends = ThinkNode_M7
 build_flags =
   ${ThinkNode_M7.build_flags}
   -I examples/companion_radio/ui-orig
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=NullDisplayDriver
diff --git a/variants/thinknode_m9/platformio.ini b/variants/thinknode_m9/platformio.ini
index 085ab7d5..d4983491 100755
--- a/variants/thinknode_m9/platformio.ini
+++ b/variants/thinknode_m9/platformio.ini
@@ -137,6 +137,7 @@ extends = ThinkNode_M9
 build_flags =
   ${ThinkNode_M9.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index cca2907a..62e6fd21 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -118,6 +118,7 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/wifi/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index de656c44..3bb95607 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -208,6 +208,7 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
+  -D ENABLE_WIFI_INTERFACE
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256