diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index 6bf486f38..5522fd5fe 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -14,7 +14,6 @@ FW_QCA6564-BT = " \
 
 FW_QCA6564-WIFI = " \
     file://bdwlan30_US.bin \
-    file://bdwlan30_World.bin \
     file://LICENCE.atheros_firmware \
     file://otp30.bin \
     file://qwlan30.bin \
@@ -42,7 +41,6 @@ do_install() {
 	install -d ${D}${base_libdir}/firmware
 	install -m 0644 \
 		bdwlan30_US.bin \
-		bdwlan30_World.bin \
 		LICENCE.atheros_firmware \
 		otp30.bin \
 		qwlan30.bin \
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin
deleted file mode 100644
index 65f13b87e..000000000
Binary files a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin and /dev/null differ
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
index 89efc7e75..3c1cccdeb 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up
@@ -78,8 +78,13 @@ case "${REGULATORY_DOMAIN}" in
 	${US_CODE})
 		logger -t qca6564 "Setting US wireless region";;
 	${WW_CODE}|${JP_CODE})
-		logger -t qca6564 "Setting WW (world wide) wireless region"
-		BDATA_SOURCE="${FIRMWARE_DIR}/bdwlan30_World.bin";;
+		if [ -e "${FIRMWARE_DIR}/bdwlan30_World.bin" ]; then
+			logger -t qca6564 "Setting WW (world wide) wireless region"
+			BDATA_SOURCE="${FIRMWARE_DIR}/bdwlan30_World.bin"
+		else
+			logger -t qca6564 "[WARN] No WW (worldwide) board data file, using US"
+		fi
+		;;
 	"")
 		logger -t qca6564 "[WARN] region code not found, using US";;
 	*)