diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 14ee521..93055eb 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4932,6 +4932,9 @@
 #if defined(MBEDTLS_ECDH_C)
     mbedtls_ecdh_init( &handshake->ecdh_ctx );
 #endif
+#if defined(MBEDTLS_ECJPAKE_C)
+    mbedtls_ecjpake_init( &handshake->ecjpake_ctx );
+#endif
 
 #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
     handshake->sni_authmode = MBEDTLS_SSL_VERIFY_UNSET;
@@ -6590,6 +6593,9 @@
 #if defined(MBEDTLS_ECDH_C)
     mbedtls_ecdh_free( &handshake->ecdh_ctx );
 #endif
+#if defined(MBEDTLS_ECJPAKE_C)
+    mbedtls_ecjpake_free( &handshake->ecjpake_ctx );
+#endif
 
 #if defined(MBEDTLS_ECDH_C) || defined(MBEDTLS_ECDSA_C)
     /* explicit void pointer cast for buggy MS compiler */