diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 32f290b45..62b983aa4 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4022,15 +4022,15 @@ static void ssl_sock_shutw(struct connection *conn, int clean)
 {
 	if (conn->flags & CO_FL_HANDSHAKE)
 		return;
+	if (!clean)
+		/* don't sent notify on SSL_shutdown */
+		SSL_CTX_set_quiet_shutdown(conn->xprt_ctx, 1);
 	/* no handshake was in progress, try a clean ssl shutdown */
-	if (clean && (SSL_shutdown(conn->xprt_ctx) <= 0)) {
+	if (SSL_shutdown(conn->xprt_ctx) <= 0) {
 		/* Clear openssl global errors stack */
 		ssl_sock_dump_errors(conn);
 		ERR_clear_error();
 	}
-
-	/* force flag on ssl to keep session in cache regardless shutdown result */
-	SSL_set_shutdown(conn->xprt_ctx, SSL_SENT_SHUTDOWN);
 }
 
 /* used for logging, may be changed for a sample fetch later */