diff --git a/configs/default_defconfig b/configs/default_defconfig
index 617a88ad2f45..ff426d2574c5 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -276,6 +276,9 @@ CONFIG_WLAN_FEATURE_DSRC := y
 endif
 
 ifneq ($(CONFIG_ROME_IF),usb)
+	#Flag to enable SAE
+	CONFIG_WLAN_FEATURE_SAE := y
+
 ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable DISA
 	CONFIG_WLAN_FEATURE_DISA := y
@@ -283,9 +286,6 @@ ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable FIPS
 	CONFIG_WLAN_FEATURE_FIPS := y
 
-	#Flag to enable SAE
-	CONFIG_WLAN_FEATURE_SAE := y
-
 	#Flag to enable Fast Path feature
 	ifneq ($(CONFIG_LITHIUM), y)
 		CONFIG_WLAN_FASTPATH := y
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index 8c68e2bc29f0..ae9d9fce9f8b 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -201,6 +201,9 @@ CONFIG_WLAN_FEATURE_DSRC := y
 endif
 
 ifneq ($(CONFIG_ROME_IF),usb)
+	#Flag to enable SAE
+	CONFIG_WLAN_FEATURE_SAE := y
+
 ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable DISA
 	CONFIG_WLAN_FEATURE_DISA := y
@@ -208,9 +211,6 @@ ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable FIPS
 	CONFIG_WLAN_FEATURE_FIPS := y
 
-	#Flag to enable SAE
-	CONFIG_WLAN_FEATURE_SAE := y
-
 	# Flag to enable NAPI
 	CONFIG_WLAN_NAPI := y
 	CONFIG_WLAN_NAPI_DEBUG := n
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index c50692952e95..ed430dd7b1f3 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -226,6 +226,9 @@ CONFIG_WLAN_FEATURE_DSRC := y
 endif
 
 ifneq ($(CONFIG_ROME_IF),usb)
+	#Flag to enable SAE
+	CONFIG_WLAN_FEATURE_SAE := y
+
 ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable DISA
 	CONFIG_WLAN_FEATURE_DISA := y
@@ -233,9 +236,6 @@ ifneq ($(CONFIG_ROME_IF),sdio)
 	#Flag to enable FIPS
 	CONFIG_WLAN_FEATURE_FIPS := y
 
-	#Flag to enable SAE
-	CONFIG_WLAN_FEATURE_SAE := y
-
 	#Flag to enable Fast Path feature
 	ifneq ($(CONFIG_LITHIUM), y)
 		CONFIG_WLAN_FASTPATH := y