diff --git a/Kbuild b/Kbuild
index 2364a59130..b56c05850c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -3627,6 +3627,9 @@ cppflags-$(CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY) += -DWLAN_FEATURE_DP_RX_RING_
 cppflags-$(CONFIG_WLAN_FEATURE_DP_TX_DESC_HISTORY) += -DWLAN_FEATURE_DP_TX_DESC_HISTORY
 cppflags-$(CONFIG_REO_QDESC_HISTORY) += -DREO_QDESC_HISTORY
 cppflags-$(CONFIG_DP_TX_HW_DESC_HISTORY) += -DDP_TX_HW_DESC_HISTORY
+ifdef CONFIG_QDF_NBUF_HISTORY_SIZE
+ccflags-y += -DQDF_NBUF_HISTORY_SIZE=$(CONFIG_QDF_NBUF_HISTORY_SIZE)
+endif
 cppflags-$(CONFIG_WLAN_DP_PER_RING_TYPE_CONFIG) += -DWLAN_DP_PER_RING_TYPE_CONFIG
 cppflags-$(CONFIG_WLAN_CE_INTERRUPT_THRESHOLD_CONFIG) += -DWLAN_CE_INTERRUPT_THRESHOLD_CONFIG
 cppflags-$(CONFIG_SAP_DHCP_FW_IND) += -DSAP_DHCP_FW_IND
diff --git a/configs/default_defconfig b/configs/default_defconfig
index b87a6c0f79..51d0ea6ce0 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -1125,6 +1125,7 @@ ifeq ($(CONFIG_LITHIUM), y)
 		CONFIG_ALLOW_PKT_DROPPING := y
 		CONFIG_REO_QDESC_HISTORY := y
 		CONFIG_DP_TX_HW_DESC_HISTORY := y
+		CONFIG_QDF_NBUF_HISTORY_SIZE := 8192
 	endif
 	ifeq ($(CONFIG_CNSS2_DEBUG), y)
 		CONFIG_HIF_CE_DEBUG_DATA_BUF := y
@@ -1134,6 +1135,7 @@ ifeq ($(CONFIG_LITHIUM), y)
 		CONFIG_WLAN_FEATURE_DP_TX_DESC_HISTORY := y
 		CONFIG_REO_QDESC_HISTORY := y
 		CONFIG_DP_TX_HW_DESC_HISTORY := y
+		CONFIG_QDF_NBUF_HISTORY_SIZE := 8192
 	endif
 	CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY := y
 	CONFIG_ALLOW_PKT_DROPPING := y