diff --git a/Kbuild b/Kbuild
index 151bc58f6d62..1429903c2704 100644
--- a/Kbuild
+++ b/Kbuild
@@ -193,10 +193,6 @@ CONFIG_WLAN_FEATURE_DP_RX_THREADS := y
 CONFIG_WLAN_FEATURE_RX_SOFTIRQ_TIME_LIMIT := y
 endif
 
-ifeq ($(CONFIG_HELIUMPLUS), y)
-CONFIG_WLAN_RECORD_RX_PADDR := y
-endif
-
 ifeq ($(CONFIG_WLAN_NUD_TRACKING), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_nud_tracking.o
 endif
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 8843ccaace51..cfafb42fe98b 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -878,6 +878,7 @@ ifeq ($(CONFIG_LITHIUM), y)
 	ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
 		CONFIG_WLAN_FEATURE_DP_EVENT_HISTORY := y
 		CONFIG_HIF_CE_DEBUG_DATA_BUF := y
+		CONFIG_WLAN_RECORD_RX_PADDR := y
 	endif
 	CONFIG_WLAN_DP_PER_RING_TYPE_CONFIG := y
 	#Enable WMI TX/RX over QMI