diff --git a/src/mux_h2.c b/src/mux_h2.c
index 545bb38..d859a8a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3469,7 +3469,8 @@
 		if (h2c->flags & H2_CF_MUX_MALLOC)
 			done = 1; // we won't go further without extra buffers
 
-		if (conn->flags & CO_FL_ERROR)
+		if ((conn->flags & (CO_FL_SOCK_WR_SH|CO_FL_ERROR)) ||
+		    (h2c->st0 == H2_CS_ERROR2) || (h2c->flags & H2_CF_GOAWAY_FAILED))
 			break;
 
 		if (h2c->flags & (H2_CF_MUX_MFULL | H2_CF_DEM_MBUSY | H2_CF_DEM_MROOM))