diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index cebc47710..c785384ec 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -589,9 +589,7 @@ int tcp_connect_probe(struct connection *conn)
 	 */
 
 	conn->flags |= CO_FL_ERROR;
-	fdtab[fd].ev &= ~FD_POLL_STICKY;
 	EV_FD_REM(fd);
-	si->flags |= SI_FL_ERR;
 	retval = 1;
 	goto out_wakeup;
 }
diff --git a/src/sock_raw.c b/src/sock_raw.c
index cdb0e2714..8136d601c 100644
--- a/src/sock_raw.c
+++ b/src/sock_raw.c
@@ -467,9 +467,7 @@ static int sock_raw_read(struct connection *conn)
 	 */
 
 	conn->flags |= CO_FL_ERROR;
-	fdtab[fd].ev &= ~FD_POLL_STICKY;
 	EV_FD_REM(fd);
-	si->flags |= SI_FL_ERR;
 	retval = 1;
 	goto out_wakeup;
 }
@@ -662,9 +660,7 @@ static int sock_raw_write(struct connection *conn)
 	 */
 
 	conn->flags |= CO_FL_ERROR;
-	fdtab[fd].ev &= ~FD_POLL_STICKY;
 	EV_FD_REM(fd);
-	si->flags |= SI_FL_ERR;
 	return 1;
 }
 
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 9d6f9616c..1a6db199a 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -498,6 +498,9 @@ void stream_sock_update_conn(struct connection *conn)
 		__FUNCTION__,
 		si, si->state, si->ib->flags, si->ob->flags);
 
+	if (conn->flags & CO_FL_ERROR)
+		si->flags |= SI_FL_ERR;
+
 	/* process consumer side, only once if possible */
 	if (fdtab[fd].ev & (FD_POLL_OUT | FD_POLL_ERR)) {
 		if (si->ob->flags & BF_OUT_EMPTY) {