diff --git a/Kbuild b/Kbuild
index 0f1aeb199c45..4565dbe15af8 100644
--- a/Kbuild
+++ b/Kbuild
@@ -3513,6 +3513,10 @@ ifdef CONFIG_SCHED_HISTORY_SIZE
 ccflags-y += -DWLAN_SCHED_HISTORY_SIZE=$(CONFIG_SCHED_HISTORY_SIZE)
 endif
 
+ifdef CONFIG_HANDLE_RX_REROUTE_ERR
+cppflags-y += -DHANDLE_RX_REROUTE_ERR
+endif
+
 # configure log buffer size
 ifdef CONFIG_CFG_NUM_DP_TRACE_RECORD
 ccflags-y += -DMAX_QDF_DP_TRACE_RECORDS=$(CONFIG_CFG_NUM_DP_TRACE_RECORD)
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 9097885287d3..3ec6be41a855 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -1,5 +1,7 @@
 CONFIG_TX_AGGREGATION_SIZE_ENABLE := y
 
+CONFIG_HANDLE_RX_REROUTE_ERR := y
+
 ifeq ($(CONFIG_CNSS_QCA6290), y)
 	ifeq ($(CONFIG_CNSS_EMULATION), y)
 		CONFIG_QCA_WIFI_NAPIER_EMULATION := y