diff --git a/src/connection.c b/src/connection.c
index 03a9bb0..4bb497e 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -52,6 +52,13 @@
 	flags = conn->flags &= ~(CO_FL_WAIT_DATA|CO_FL_WAIT_ROOM|CO_FL_WAIT_RD|CO_FL_WAIT_WR);
 	flags &= ~CO_FL_ERROR; /* ensure to call the wake handler upon error */
 
+	/* adjust current polling status if it has been updated below us */
+	if (fd_ev_is_set(conn->t.sock.fd, DIR_RD))
+		conn->flags |= CO_FL_CURR_RD_ENA;
+
+	if (fd_ev_is_set(conn->t.sock.fd, DIR_WR))
+		conn->flags |= CO_FL_CURR_WR_ENA;
+
 	if (unlikely(conn->flags & CO_FL_ERROR))
 		goto leave;