diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
index 13c8a01522..9097102786 100644
--- a/components/mbedtls/Kconfig
+++ b/components/mbedtls/Kconfig
@@ -231,6 +231,7 @@ menu "mbedTLS"
     config MBEDTLS_CMAC_C
         bool "Enable CMAC mode for block ciphers"
         default n
+        depends on MBEDTLS_AES_C || MBEDTLS_DES_C
         help
             Enable the CMAC (Cipher-based Message Authentication Code) mode for
             block ciphers.
diff --git a/components/wpa_supplicant/Kconfig b/components/wpa_supplicant/Kconfig
index 21dd7bafb3..0d2785b625 100644
--- a/components/wpa_supplicant/Kconfig
+++ b/components/wpa_supplicant/Kconfig
@@ -3,6 +3,11 @@ menu "Supplicant"
     config WPA_MBEDTLS_CRYPTO
         bool "Use MbedTLS crypto APIs"
         default y
+        select MBEDTLS_AES_C
+        select MBEDTLS_ECP_C
+        select MBEDTLS_ECDH_C
+        select MBEDTLS_ECDSA_C
+        select MBEDTLS_TLS_ENABLED
         help
             Select this option to use MbedTLS crypto APIs which utilize hardware acceleration.