diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index b07cd96f1b..5cee7df8da 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -4241,7 +4241,9 @@ int mbedtls_ssl_read_record(mbedtls_ssl_context *ssl,
                  MBEDTLS_ERR_SSL_CONTINUE_PROCESSING == ret);
 
         if (0 != ret) {
-            MBEDTLS_SSL_DEBUG_RET(1, ("mbedtls_ssl_handle_message_type"), ret);
+            if (ret != MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+                MBEDTLS_SSL_DEBUG_RET(1, ("mbedtls_ssl_handle_message_type"), ret);
+            }
             return ret;
         }
 
@@ -5838,8 +5840,9 @@ int mbedtls_ssl_read(mbedtls_ssl_context *ssl, unsigned char *buf, size_t len)
             if (ret == MBEDTLS_ERR_SSL_CONN_EOF) {
                 return 0;
             }
-
-            MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_ssl_read_record", ret);
+            if (ret != MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+                MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_ssl_read_record", ret);
+            }
             return ret;
         }