diff --git a/Kbuild b/Kbuild
index 6953bc7eba0f4..f1b24822a450f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2959,6 +2959,7 @@ ccflags-$(CONFIG_HIF_PCI) += -DCE_SVC_CMN_INIT
 ccflags-$(CONFIG_HIF_IPCI) += -DCE_SVC_CMN_INIT
 ccflags-$(CONFIG_HIF_SNOC) += -DCE_SVC_CMN_INIT
 cppflags-$(CONFIG_RX_DESC_SANITY_WAR) += -DRX_DESC_SANITY_WAR
+cppflags-$(CONFIG_WBM_IDLE_LSB_WR_CNF_WAR) += -DWBM_IDLE_LSB_WRITE_CONFIRM_WAR
 
 ifeq ($(CONFIG_QCA6290_11AX), y)
 cppflags-y += -DQCA_WIFI_QCA6290_11AX -DQCA_WIFI_QCA6290_11AX_MU_UL
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 6b9c9f694c131..cdc8bd8dc5355 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -222,6 +222,9 @@ endif
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
 CONFIG_QCACLD_FEATURE_METERING := y
 CONFIG_WDI3_STATS_UPDATE := y
+ifeq ($(CONFIG_CNSS_QCA6490), y)
+CONFIG_WBM_IDLE_LSB_WR_CNF_WAR := y
+endif
 endif
 
 #Flag to enable Fast Transition (11r) feature