diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index ac87cc241..345274faf 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -946,7 +946,7 @@ int main( int argc, char *argv[] )
     else
         ssl_set_bio_timeout( &ssl, &server_fd, net_send, net_recv,
 #if defined(POLARSSL_HAVE_TIME)
-                             net_recv_timeout,
+                             opt.nbio == 0 ? net_recv_timeout : NULL,
 #else
                              NULL,
 #endif
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index d70ef4c37..7159eb31e 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1596,7 +1596,7 @@ reset:
     else
         ssl_set_bio_timeout( &ssl, &client_fd, net_send, net_recv,
 #if defined(POLARSSL_HAVE_TIME)
-                             net_recv_timeout,
+                             opt.nbio == 0 ? net_recv_timeout : NULL,
 #else
                              NULL,
 #endif