diff --git a/Kbuild b/Kbuild
index 5b9ed3e617..b84981c315 100644
--- a/Kbuild
+++ b/Kbuild
@@ -435,6 +435,8 @@ CONFIG_CP_STATS := y
 
 CONFIG_FEATURE_WLAN_WAPI := y
 
+CONFIG_AGEIE_ON_SCAN_RESULTS := y
+
 ifeq ($(CONFIG_HELIUMPLUS), y)
 ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
 CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
@@ -1856,7 +1858,6 @@ CDEFINES :=	-DANI_OS_TYPE_ANDROID=6 \
 		-DSOFTAP_CHANNEL_RANGE \
 		-DFEATURE_WLAN_SCAN_PNO \
 		-DWLAN_FEATURE_PACKET_FILTERING \
-		-DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \
 		-DWLAN_NS_OFFLOAD \
 		-DWLAN_SOFTAP_VSTA_FEATURE \
 		-DWLAN_FEATURE_GTK_OFFLOAD \
@@ -1884,6 +1885,7 @@ CDEFINES :=	-DANI_OS_TYPE_ANDROID=6 \
 
 ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DFEATURE_WLAN_WAPI
 ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DATH_SUPPORT_WAPI
+ccflags-$(CONFIG_AGEIE_ON_SCAN_RESULTS) += -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS
 
 ifeq ($(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL), y)
 CDEFINES += -DWLAN_DISABLE_EXPORT_SYMBOL