diff --git a/src/stream_interface.c b/src/stream_interface.c
index cf3f9d2ef..017d1ef31 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -678,6 +678,9 @@ int si_cs_send(struct conn_stream *cs)
 			 * system buffers are full, we will try next time.
 			 */
 		}
+
+		if (conn->flags & CO_FL_ERROR || cs->flags & CS_FL_ERROR)
+			return 1;
 	}
  end:
 	/* We couldn't send all of our data, let the mux know we'd like to send more */