diff --git a/src/config/config.h b/src/config/config.h
index 49705eb6..7a3dbb64 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -16,9 +16,8 @@
 //-------------------------------------
 
 // Fallback WiFi Info
-#define FB_WIFI_SSID    "YOUR_WIFI_SSID"
-#define FB_WIFI_PWD     "YOUR_WIFI_PWD"
-
+#define FB_WIFI_SSID    ""
+#define FB_WIFI_PWD     ""
 
 // Access Point Info
 // In case there is no WiFi Network or Ahoy can not connect to it, it will act as an Access Point
diff --git a/src/config/config_override_example.h b/src/config/config_override_example.h
index 44623c1f..a84c1e8a 100644
--- a/src/config/config_override_example.h
+++ b/src/config/config_override_example.h
@@ -6,9 +6,6 @@
 #ifndef __CONFIG_OVERRIDE_H__
 #define __CONFIG_OVERRIDE_H__
 
-// override fallback WiFi info
-#define FB_WIFI_OVERRIDDEN
-
 // each override must be preceded with an #undef statement
 #undef FB_WIFI_SSID
 #define FB_WIFI_SSID    "MY_SSID"
diff --git a/src/network/AhoyWifiEsp32.h b/src/network/AhoyWifiEsp32.h
index 89c9bbb4..b718043a 100644
--- a/src/network/AhoyWifiEsp32.h
+++ b/src/network/AhoyWifiEsp32.h
@@ -17,7 +17,7 @@ class AhoyWifi : public AhoyNetwork {
         void begin() override {
             mAp.enable();
 
-            if(String(FB_WIFI_SSID) == mConfig->sys.stationSsid)
+            if(strlen(mConfig->sys.stationSsid) == 0)
                 return; // no station wifi defined
 
             WiFi.disconnect(); // clean up