diff --git a/dtls/client-dtls-nonblocking.c b/dtls/client-dtls-nonblocking.c
index 1a74867d..b7d4cd46 100644
--- a/dtls/client-dtls-nonblocking.c
+++ b/dtls/client-dtls-nonblocking.c
@@ -110,7 +110,7 @@ int main (int argc, char** argv)
     }
 
     wolfSSL_set_fd(ssl, sockfd);
-    wolfSSL_set_using_nonblock(ssl, 1);
+    wolfSSL_dtls_set_using_nonblock(ssl, 1);
     fcntl(sockfd, F_SETFL, O_NONBLOCK);
 
 /*****************************************************************************/
diff --git a/dtls/server-dtls-nonblocking.c b/dtls/server-dtls-nonblocking.c
index 9726d4c9..b1b84838 100644
--- a/dtls/server-dtls-nonblocking.c
+++ b/dtls/server-dtls-nonblocking.c
@@ -225,7 +225,7 @@ int main(int argc, char** argv)
         /* set the/ session ssl to client connection port */
         wolfSSL_set_fd(ssl, clientfd);
 
-        wolfSSL_set_using_nonblock(ssl, 1);
+        wolfSSL_dtls_set_using_nonblock(ssl, 1);
 
 /*****************************************************************************/
 /*                      NonBlockingDTLS_Connect code                         */
diff --git a/psk/client-psk-nonblocking.c b/psk/client-psk-nonblocking.c
index 78b0c29b..fa924cae 100644
--- a/psk/client-psk-nonblocking.c
+++ b/psk/client-psk-nonblocking.c
@@ -153,10 +153,6 @@ int main(int argc, char **argv)
     /* associate the file descriptor with the session */
     wolfSSL_set_fd(ssl, sockfd);
 
-    /* tell wolfSSL that nonblocking is going to be used */
-    wolfSSL_set_using_nonblock(ssl, 1);
-
-
     /* setting up and running nonblocking socket */
     ret    = wolfSSL_connect(ssl);
     error  = wolfSSL_get_error(ssl, 0);
diff --git a/psk/server-psk-nonblocking.c b/psk/server-psk-nonblocking.c
index 3cf55eda..9d35b022 100644
--- a/psk/server-psk-nonblocking.c
+++ b/psk/server-psk-nonblocking.c
@@ -202,8 +202,7 @@ int main()
             wolfSSL_set_fd(ssl, connfd);
             sockfd = wolfSSL_get_fd(ssl);
 
-            /* set wolfSSL and socket to non blocking and respond */
-            wolfSSL_set_using_nonblock(ssl, 1);
+            /* set socket to non blocking and respond */
             if (fcntl(connfd, F_SETFL, O_NONBLOCK) < 0) {
                 printf("Fatal error : fcntl set failed\n");
                 return 1;
diff --git a/tls/client-tls-nonblocking.c b/tls/client-tls-nonblocking.c
index 2cf0d716..1ca7a9c5 100644
--- a/tls/client-tls-nonblocking.c
+++ b/tls/client-tls-nonblocking.c
@@ -130,9 +130,6 @@ int main(int argc, char** argv)
     /* Attach wolfSSL to the socket */
     wolfSSL_set_fd(ssl, sockfd);
 
-    /* make wolfSSL object nonblocking */
-    wolfSSL_set_using_nonblock(ssl, 1);
-
     /* Connect to wolfSSL on the server side */
     while (wolfSSL_connect(ssl) != SSL_SUCCESS) {
         if (wolfSSL_want_read(ssl)) {