diff --git a/src/mux_h1.c b/src/mux_h1.c
index 7fd07d355..0de669022 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1937,7 +1937,7 @@ static int h1_process(struct h1c * h1c)
 
 	if (h1c->flags & H1C_F_CS_WAIT_CONN) {
 		if (!(conn->flags & (CO_FL_CONNECTED|CO_FL_ERROR)) ||
-		    (conn->flags & CO_FL_HANDSHAKE))
+		    (!(conn->flags & CO_FL_ERROR) && (conn->flags & CO_FL_HANDSHAKE)))
 			goto end;
 		h1c->flags &= ~H1C_F_CS_WAIT_CONN;
 		h1_wake_stream_for_send(h1s);