diff --git a/Kbuild b/Kbuild
index a58f804c96fd..09e2b35abc7e 100755
--- a/Kbuild
+++ b/Kbuild
@@ -2251,7 +2251,7 @@ cppflags-y += -DCONFIG_SERIALIZATION_V1
 ccflags-$(CONFIG_ENABLE_SIZE_OPTIMIZE) += -Os
 
 # DFS component
-cppflags-y += -DWLAN_DFS_STATIC_MEM_ALLOC
+cppflags-$(CONFIG_WLAN_DFS_STATIC_MEM_ALLOC) += -DWLAN_DFS_STATIC_MEM_ALLOC
 cppflags-$(CONFIG_WLAN_DFS_MASTER_ENABLE) += -DQCA_MCL_DFS_SUPPORT
 ifeq ($(CONFIG_WLAN_FEATURE_DFS_OFFLOAD), y)
 cppflags-$(CONFIG_WLAN_DFS_MASTER_ENABLE) += -DWLAN_DFS_FULL_OFFLOAD
diff --git a/configs/default_defconfig b/configs/default_defconfig
index c5c79f571280..855e38d11d26 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -524,6 +524,7 @@ CONFIG_FEATURE_STATS_EXT := y
 
 #Flag to allocate memory dynamically for different buffers
 CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := n
+CONFIG_WLAN_DFS_STATIC_MEM_ALLOC := y
 
 #Flag to enable HTC credit history feature
 CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
diff --git a/configs/genoa.common b/configs/genoa.common
index 05545fa965fd..a7d46cf6e191 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -157,6 +157,11 @@ CONFIG_BUILD_TAG := y
 endif
 endif
 
+#Buffer allocations dynamically
+ifeq ($(CONFIG_WLAN_ALLOCATE_GLOBAL_BUFFERS_DYNAMICALLY), y)
+CONFIG_WLAN_DFS_STATIC_MEM_ALLOC := n
+endif
+
 # WoW filer configs
 CONFIG_CFG_PMO_WOW_FILTERS_MAX := 16