diff --git a/src/main.cpp b/src/main.cpp
index 1ddb86f0..380120ee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -276,6 +276,7 @@ void setup() {
   libpax_default_config(&configuration);
 
   // configure WIFI sniffing
+  strcpy(configuration.wifi_my_country, WIFI_MY_COUNTRY);
   configuration.wificounter = cfg.wifiscan;
   configuration.wifi_channel_map = WIFI_CHANNEL_ALL;
   configuration.wifi_channel_switch_interval = cfg.wifichancycle;
diff --git a/src/paxcounter_orig.conf b/src/paxcounter_orig.conf
index 2848a42d..5249a6f0 100644
--- a/src/paxcounter_orig.conf
+++ b/src/paxcounter_orig.conf
@@ -48,9 +48,7 @@
 */
 
 // WiFi scan parameters
-#define WIFI_CHANNEL_MIN                1       // start channel number where scan begings
-#define	WIFI_CHANNEL_MAX                13      // total channel number to scan
-#define WIFI_MY_COUNTRY                 "EU"    // select locale for Wifi RF settings
+#define WIFI_MY_COUNTRY                 "01"    // select 2-letter locale for Wifi RF settings, e.g. "DE"; use "01" for world safe mode
 #define	WIFI_CHANNEL_SWITCH_INTERVAL    50      // [seconds/100] -> 0,5 sec.
 
 // LoRa payload default parameters