diff --git a/Kbuild b/Kbuild
index a35703695a..bfe529a95a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2904,7 +2904,7 @@ cppflags-$(CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT) += -DWLAN_FEATURE_RX_SOFTI
 cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE) += -DFEATURE_HAL_DELAYED_REG_WRITE
 cppflags-$(CONFIG_FEATURE_HAL_DELAYED_REG_WRITE_V2) += -DFEATURE_HAL_DELAYED_REG_WRITE_V2
 cppflags-$(CONFIG_QCA_OL_DP_SRNG_LOCK_LESS_ACCESS) += -DQCA_OL_DP_SRNG_LOCK_LESS_ACCESS
-
+cppflags-$(CONFIG_SHADOW_WRITE_DELAY) += -DSHADOW_WRITE_DELAY
 
 cppflags-$(CONFIG_PLD_USB_CNSS) += -DCONFIG_PLD_USB_CNSS
 cppflags-$(CONFIG_PLD_SDIO_CNSS2) += -DCONFIG_PLD_SDIO_CNSS2
diff --git a/configs/default_defconfig b/configs/default_defconfig
index da27a3fb6b..5df3654234 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -548,6 +548,9 @@ CONFIG_VERBOSE_DEBUG := y
 CONFIG_RX_DESC_SANITY_WAR := y
 ifeq ($(CONFIG_PCI_MSM), y)
 	CONFIG_FEATURE_HAL_DELAYED_REG_WRITE := y
+ifeq ($(CONFIG_CNSS_QCA6390), y)
+	CONFIG_SHADOW_WRITE_DELAY := y
+endif
 endif
 
 #