diff --git a/Kbuild b/Kbuild
index 04f07594c80b..4645edcf634a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -687,6 +687,8 @@ OS_IF_INC += -I$(WLAN_COMMON_INC)/os_if/linux \
 OS_IF_OBJ += $(OS_IF_DIR)/linux/wlan_osif_request_manager.o \
 	     $(OS_IF_DIR)/linux/crypto/src/wlan_nl_to_crypto_params.o
 
+CONFIG_CRYPTO_COMPONENT := y
+
 ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
 OS_IF_OBJ += $(OS_IF_DIR)/linux/crypto/src/wlan_cfg80211_crypto.o
 endif
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 18154a80428a..e9feb4b94be6 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -148,7 +148,6 @@ endif
 CONFIG_WLAN_DISABLE_EXPORT_SYMBOL := y
 
 CONFIG_QCACLD_FEATURE_GREEN_AP := y
-CONFIG_CRYPTO_COMPONENT := y
 #Flag to enable Android Packet Filtering
 CONFIG_QCACLD_FEATURE_APF := y
 
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index ae9d9fce9f8b..b36f6feadddf 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -93,7 +93,6 @@ CONFIG_WLAN_SYSFS := y
 endif
 
 CONFIG_QCACLD_FEATURE_GREEN_AP := y
-CONFIG_CRYPTO_COMPONENT := y
 #Flag to enable Android Packet Filtering
 CONFIG_QCACLD_FEATURE_APF := y
 
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index 76125f06123d..a8ae1930776d 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -115,7 +115,6 @@ CONFIG_WLAN_SYSFS := y
 endif
 
 CONFIG_QCACLD_FEATURE_GREEN_AP := y
-CONFIG_CRYPTO_COMPONENT := y
 #Flag to enable Android Packet Filtering
 CONFIG_QCACLD_FEATURE_APF := y