diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 483743dad1..2d1dcf868c 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -666,12 +666,6 @@ static int ssl_validate_ciphersuite( const mbedtls_ssl_ciphersuite_t * suite_inf
         return( 1 );
 #endif
 
-#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
-    if( suite_info->key_exchange == MBEDTLS_KEY_EXCHANGE_ECJPAKE &&
-            mbedtls_ecjpake_check( &ssl->handshake->ecjpake_ctx ) != 0 )
-        return( 1 );
-#endif
-
     return( 0 );
 }