diff --git a/map-controller/files/etc/uci-defaults/99-mapcntlr b/map-controller/files/etc/uci-defaults/99-mapcntlr
index e7ce96cc9..7db1b9345 100644
--- a/map-controller/files/etc/uci-defaults/99-mapcntlr
+++ b/map-controller/files/etc/uci-defaults/99-mapcntlr
@@ -11,6 +11,7 @@ BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
 [ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
 
 FALLBACK_SSID="$DEVICE_MANUFACTURER-$BASEMAC_ADDR"
+BOARD_DB_KEY="$(db -q get hw.board.wpa_key)"
 FALLBACK_KEY="1234567890"
 FALLBACK_2G_ENCRYPTION="sae-mixed"
 FALLBACK_5G_ENCRYPTION="sae-mixed"
@@ -61,6 +62,7 @@ set_missing_vars_from_fallback() {
 				WIFI_FH_${band}_${what} \
 				WIFI_FH_${band}_${what} \
 				WIFI_FH_ALL_${what} \
+				BOARD_DB_${what}
 				FALLBACK_${what}
 		done
 		# Per band fallback variables for encryption because SAE is mandatory on 6 GHz