diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index d62d24ecb8..d624b196ce 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1692,7 +1692,7 @@ int main( int argc, char *argv[] )
         {
             opt.query_config_mode = 1;
             query_config_ret = query_config( q );
-            mbedtls_exit( ret );
+            goto exit;
         }
         else if( strcmp( p, "serialize") == 0 )
         {
@@ -2691,7 +2691,7 @@ int main( int argc, char *argv[] )
         {
             mbedtls_printf( " failed\n  ! mbedtls_ssl_set_cid returned %d\n\n",
                             ret );
-            return( ret );
+            goto exit;
         }
     }
 #endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 3bc1712de6..1ccdeaecac 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -2392,7 +2392,7 @@ int main( int argc, char *argv[] )
         {
             opt.query_config_mode = 1;
             query_config_ret = query_config( q );
-            mbedtls_exit( ret );
+            goto exit;
         }
         else if( strcmp( p, "serialize") == 0 )
         {