diff --git a/src/stream_interface.c b/src/stream_interface.c
index ef0fea7..211fe2d 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -1215,6 +1215,10 @@
 	int read_poll = MAX_READ_POLL_LOOPS;
 	int flags = 0;
 
+	/* If not established yet, do nothing. */
+	if (si->state != SI_ST_EST)
+		return 0;
+
 	/* If another call to si_cs_recv() failed, and we subscribed to
 	 * recv events already, give up now.
 	 */
@@ -1293,8 +1297,6 @@
 			ic->total += ret;
 			cur_read += ret;
 			ic->flags |= CF_READ_PARTIAL;
-			if (si->state == SI_ST_CON)
-				si->state = SI_ST_RDY;
 		}
 
 		if (cs->flags & CS_FL_EOS)
@@ -1391,8 +1393,6 @@
 
 		ic->flags |= CF_READ_PARTIAL;
 		ic->total += ret;
-		if (si->state == SI_ST_CON)
-			si->state = SI_ST_RDY;
 
 		if ((ic->flags & CF_READ_DONTWAIT) || --read_poll <= 0) {
 			/* we're stopped by the channel's policy */
@@ -1544,16 +1544,7 @@
 
 	si_done_get(si);
 
-	/* Don't change the state to SI_ST_DIS yet if we're still
-	 * in SI_ST_CON, otherwise it means sess_establish() hasn't
-	 * been called yet, and so the analysers would not run. However
-	 * it's fine to switch to SI_ST_RDY as we have really validated
-	 * the connection.
-	 */
-	if (si->state == SI_ST_EST)
-		si->state = SI_ST_DIS;
-	else if (si->state == SI_ST_CON)
-		si->state = SI_ST_RDY;
+	si->state = SI_ST_DIS;
 	si->exp = TICK_ETERNITY;
 	return;
 }