diff --git a/BoardConfig.mk b/BoardConfig.mk
index 974bab6..566fa65 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -69,4 +69,3 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 WPA_SUPPLICANT_VERSION := VER_0_8_X
-BOARD_KERNEL_CMDLINE += androidboot.wificountrycode=00
diff --git a/vendor.prop b/vendor.prop
index b54e39e..e751af8 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -64,6 +64,7 @@ media.c2.hal.selection=aidl
 persist.device_config.mglru_native.lru_gen_config=core
 
 # Wifi
+ro.boot.wificountrycode=00
 wifi.interface=wlan0
 
 # Window extensions