diff --git a/Kbuild b/Kbuild
index 5dc1593..66b9438 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1548,6 +1548,7 @@
 cppflags-$(CONFIG_FEATURE_HTC_CREDIT_HISTORY) += -DFEATURE_HTC_CREDIT_HISTORY
 cppflags-$(CONFIG_WLAN_FEATURE_P2P_DEBUG) += -DWLAN_FEATURE_P2P_DEBUG
 cppflags-$(CONFIG_WLAN_LOGGING_SOCK_SVC) += -DWLAN_LOGGING_SOCK_SVC_ENABLE
+cppflags-$(CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY) += -DWLAN_LOGGING_BUFFERS_DYNAMICALLY
 cppflags-$(CONFIG_WLAN_FEATURE_FILS) += -DWLAN_FEATURE_FILS_SK
 cppflags-$(CONFIG_CP_STATS) += -DQCA_SUPPORT_CP_STATS
 cppflags-$(CONFIG_FEATURE_MEMDUMP_ENABLE) += -DWLAN_FEATURE_MEMDUMP_ENABLE
diff --git a/configs/default_defconfig b/configs/default_defconfig
index f949c0b..86d979e 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -469,6 +469,9 @@
 #Flag to enable Stats Ext implementation
 CONFIG_FEATURE_STATS_EXT := y
 
+#Flag to allocate memory dynamically for different buffers
+CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := n
+
 #Flag to enable HTC credit history feature
 CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
 
diff --git a/configs/genoa.snoc.debug_defconfig b/configs/genoa.snoc.debug_defconfig
index f4b26d2..14a607e 100644
--- a/configs/genoa.snoc.debug_defconfig
+++ b/configs/genoa.snoc.debug_defconfig
@@ -86,6 +86,7 @@
 endif
 
 # Debug specific features
+CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
 BUILD_DEBUG_VERSION := y
 BUILD_DIAG_VERSION := y
 CONFIG_FEATURE_TSO_DEBUG := y
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index 7a542b3..1356e3d 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -82,6 +82,7 @@
 endif
 
 # Debug specific features
+CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
 BUILD_DEBUG_VERSION := y
 BUILD_DIAG_VERSION := y
 CONFIG_FEATURE_TSO_DEBUG := n