diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 971dae1..a8bc64a 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -396,7 +396,9 @@
         /*
          * 3. Setup stuff
          */
-        if( ( ret = mbedtls_ssl_config_defaults( &conf ) ) != 0 )
+        if( ( ret = mbedtls_ssl_config_defaults( &conf,
+                        MBEDTLS_SSL_IS_CLIENT,
+                        MBEDTLS_SSL_TRANSPORT_STREAM ) ) != 0 )
         {
             mbedtls_printf( " failed\n  ! mbedtls_ssl_config_defaults returned %d\n\n", ret );
             goto exit;
@@ -408,7 +410,6 @@
             goto ssl_exit;
         }
 
-        mbedtls_ssl_set_endpoint( &ssl, MBEDTLS_SSL_IS_CLIENT );
         if( verify )
         {
             mbedtls_ssl_set_authmode( &ssl, MBEDTLS_SSL_VERIFY_REQUIRED );