diff --git a/components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c b/components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c
index 6c518eec22..0e07715595 100644
--- a/components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c
+++ b/components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c
@@ -291,9 +291,6 @@ static void tls_enable_sha1_config(tls_context_t *tls)
 static const int eap_ciphersuite_preference[] =
 {
 #if defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
-#if defined(MBEDTLS_SHA512_C) && defined(MBEDTLS_GCM_C)
-	MBEDTLS_TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
-#endif
 #if defined(MBEDTLS_CCM_C)
 	MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CCM,
 #endif
@@ -301,9 +298,6 @@ static const int eap_ciphersuite_preference[] =
 	MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
 	MBEDTLS_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
 #endif
-#if defined(MBEDTLS_GCM_C)
-	MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384,
-#endif
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
 	MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
 	MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
@@ -324,9 +318,7 @@ static const int eap_ciphersuite_preference[] =
 #endif
 #endif
 #if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED)
-	MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384,
 	MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM,
-	MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
 	MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
 	MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM_8,
 
@@ -335,9 +327,6 @@ static const int eap_ciphersuite_preference[] =
 	MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
 	MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM_8,
 #endif
-#if defined(MBEDTLS_SHA512_C) && defined(MBEDTLS_GCM_C)
-	MBEDTLS_TLS_RSA_WITH_AES_256_GCM_SHA384,
-#endif
 #if defined(MBEDTLS_CCM_C)
 	MBEDTLS_TLS_RSA_WITH_AES_256_CCM,
 #endif
@@ -386,14 +375,10 @@ static const int eap_ciphersuite_preference[] =
 	MBEDTLS_TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
 #endif
 	/* The PSK suites */
-#if defined(MBEDTLS_GCM_C)
-	MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384,
-#endif
 #if defined(MBEDTLS_CCM_C)
 	MBEDTLS_TLS_PSK_WITH_AES_256_CCM,
 #endif
 #if defined(MBEDTLS_CIPHER_MODE_CBC)
-	MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA384,
 	MBEDTLS_TLS_PSK_WITH_AES_256_CBC_SHA,
 #endif
 #if defined(MBEDTLS_CCM_C)