diff --git a/Kbuild b/Kbuild
index a52ff6b82278..6e9f85e63d3b 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1943,7 +1943,6 @@ cppflags-$(CONFIG_SUPPORT_11AX) += -DSUPPORT_11AX
 cppflags-$(CONFIG_HDD_INIT_WITH_RTNL_LOCK) += -DCONFIG_HDD_INIT_WITH_RTNL_LOCK
 cppflags-$(CONFIG_WLAN_CONV_SPECTRAL_ENABLE) += -DWLAN_CONV_SPECTRAL_ENABLE
 cppflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
-cppflags-$(CONFIG_FEATURE_MONITOR_MODE_SUPPORT) += -DFEATURE_MONITOR_MODE_SUPPORT
 cppflags-$(CONFIG_WLAN_FEATURE_TWT) += -DWLAN_SUPPORT_TWT
 
 cppflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL
@@ -1965,6 +1964,13 @@ cppflags-$(CONFIG_PLD_PCIE_INIT_FLAG) += -DCONFIG_PLD_PCIE_INIT
 cppflags-$(CONFIG_WLAN_FEATURE_DP_RX_THREADS) += -DFEATURE_WLAN_DP_RX_THREADS
 cppflags-$(CONFIG_PLD_USB_CNSS) += -DCONFIG_PLD_USB_CNSS
 
+#For both legacy and lithium chip's monitor mode config
+ifeq ($(CONFIG_FEATURE_MONITOR_MODE_SUPPORT), y)
+cppflags-y += -DFEATURE_MONITOR_MODE_SUPPORT
+else
+cppflags-y += -DDISABLE_MON_CONFIG
+endif
+
 #Enable NL80211 test mode
 cppflags-$(CONFIG_NL80211_TESTMODE) += -DWLAN_NL80211_TESTMODE
 
diff --git a/configs/default_defconfig b/configs/default_defconfig
index fb8b3a3925d1..75fdb5297764 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -725,6 +725,10 @@ ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
 endif
 
+ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
+endif
+
 ifneq ($(CONFIG_HIF_USB), y)
 CONFIG_WLAN_LOGGING_SOCK_SVC := y
 endif