diff --git a/connectivity/netsocket/source/TLSSocketWrapper.cpp b/connectivity/netsocket/source/TLSSocketWrapper.cpp
index 9879af9e91..31f95fee65 100644
--- a/connectivity/netsocket/source/TLSSocketWrapper.cpp
+++ b/connectivity/netsocket/source/TLSSocketWrapper.cpp
@@ -286,10 +286,10 @@ nsapi_error_t TLSSocketWrapper::continue_handshake()
     }
 
     if (ret < 0) {
-        print_mbedtls_error("mbedtls_ssl_handshake", ret);
         if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
             return NSAPI_ERROR_ALREADY;
         } else {
+            print_mbedtls_error("mbedtls_ssl_handshake", ret);
             return NSAPI_ERROR_AUTH_FAILURE;
         }
     }