diff --git a/examples/client/client.c b/examples/client/client.c
index 0c951d65f..61efdd19d 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -2115,7 +2115,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
         /* if you're getting an error here  */
 
         ((func_args*)args)->return_code = err;
-        return 0;
+        goto exit;
     }
 
     showPeer(ssl);
@@ -2577,6 +2577,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
 
     ((func_args*)args)->return_code = 0;
 
+exit:
+
 #ifdef WOLFSSL_ASYNC_CRYPT
     wolfAsync_DevClose(&devId);
 #endif
diff --git a/examples/server/server.c b/examples/server/server.c
index d9083a3f3..0a44095ed 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -1490,7 +1490,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
                 err_sys_ex(runWithErrors, "SSL_accept failed");
 
             ((func_args*)args)->return_code = err;
-            return 0;
+            goto exit;
         }
 
         showPeer(ssl);
@@ -1677,6 +1677,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
 
     ((func_args*)args)->return_code = 0;
 
+exit:
 
 #if defined(NO_MAIN_DRIVER) && defined(HAVE_ECC) && defined(FP_ECC) \
                             && defined(HAVE_THREAD_LS)