diff --git a/Kbuild b/Kbuild
index 4826eec43e71..a58f804c96fd 100755
--- a/Kbuild
+++ b/Kbuild
@@ -1879,8 +1879,6 @@ endif
 
 ifeq ($(CONFIG_QCOM_ESE), y)
 cppflags-y += -DFEATURE_WLAN_ESE
-cppflags-y += -DQCA_COMPUTE_TX_DELAY
-cppflags-y += -DQCA_COMPUTE_TX_DELAY_PER_TID
 endif
 
 #normally, TDLS negative behavior is not needed
@@ -1964,6 +1962,8 @@ cppflags-$(CONFIG_HIF_SNOC) += -DHIF_SNOC
 
 cppflags-$(CONFIG_HL_DP_SUPPORT) += -DCONFIG_HL_SUPPORT
 cppflags-$(CONFIG_HL_DP_SUPPORT) += -DWLAN_PARTIAL_REORDER_OFFLOAD
+cppflags-$(CONFIG_HL_DP_SUPPORT) += -DQCA_COMPUTE_TX_DELAY
+cppflags-$(CONFIG_HL_DP_SUPPORT) += -DQCA_COMPUTE_TX_DELAY_PER_TID
 cppflags-$(CONFIG_LL_DP_SUPPORT) += -DCONFIG_LL_DP_SUPPORT
 cppflags-$(CONFIG_LL_DP_SUPPORT) += -DWLAN_FULL_REORDER_OFFLOAD
 
diff --git a/configs/genoa.common b/configs/genoa.common
index 9e3ffa52b986..05545fa965fd 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -23,7 +23,7 @@ CONFIG_NAN_CONVERGENCE := y
 CONFIG_POWER_MANAGEMENT_OFFLOAD := y
 CONFIG_LFR_SUBNET_DETECTION := y
 CONFIG_MCC_TO_SCC_SWITCH := y
-CONFIG_QCOM_ESE := y
+CONFIG_QCOM_ESE := n
 CONFIG_WLAN_OPEN_P2P_INTERFACE := y
 CONFIG_WLAN_CONV_SPECTRAL_ENABLE := n
 CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY := y