diff --git a/src/checks.c b/src/checks.c
index 233d754e1..f30f1ae83 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -760,12 +760,6 @@ static void __event_srv_chk_w(struct conn_stream *cs)
 	if (unlikely(check->result == CHK_RES_FAILED))
 		goto out_wakeup;
 
-	if (conn->flags & CO_FL_HANDSHAKE) {
-		if (!(conn->flags & CO_FL_ERROR))
-			cs->conn->mux->subscribe(cs, SUB_RETRY_SEND, &check->wait_list);
-		goto out;
-	}
-
 	if (retrieve_errno_from_socket(conn)) {
 		chk_report_conn_err(check, errno, 0);
 		goto out_wakeup;
@@ -849,12 +843,6 @@ static void __event_srv_chk_r(struct conn_stream *cs)
 	if (unlikely(check->result == CHK_RES_FAILED))
 		goto out_wakeup;
 
-	if (conn->flags & CO_FL_HANDSHAKE) {
-		if (!(conn->flags & CO_FL_ERROR))
-			cs->conn->mux->subscribe(cs, SUB_RETRY_RECV, &check->wait_list);
-		goto out;
-	}
-
 	/* wake() will take care of calling tcpcheck_main() */
 	if (check->type == PR_O2_TCPCHK_CHK)
 		goto out;
diff --git a/src/mux_pt.c b/src/mux_pt.c
index 4418a65f4..c44d612ef 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -295,8 +295,6 @@ static size_t mux_pt_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t
 {
 	size_t ret;
 
-	if (cs->conn->flags & CO_FL_HANDSHAKE)
-		return 0;
 	ret = cs->conn->xprt->snd_buf(cs->conn, cs->conn->xprt_ctx, buf, count, flags);
 
 	if (ret > 0)