diff --git a/src/stream.c b/src/stream.c
index 70e98b8..cac9a36 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1051,6 +1051,8 @@
 		if (!(si->flags & SI_FL_EXP))
 			return;  /* still in turn-around */
 
+		si->flags &= ~SI_FL_EXP;
+
 		si->exp = TICK_ETERNITY;
 
 		/* we keep trying on the same server as long as the stream is
diff --git a/src/stream_interface.c b/src/stream_interface.c
index da31482..a46368b 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -830,9 +830,6 @@
 	req->flags &= ~(CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ATTACHED|CF_WRITE_NULL|CF_WRITE_PARTIAL);
 	res->flags &= ~(CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ATTACHED|CF_WRITE_NULL|CF_WRITE_PARTIAL);
 
-	si_f->flags &= ~SI_FL_EXP;
-	si_b->flags &= ~SI_FL_EXP;
-
 	si_f->prev_state = si_f->state;
 	si_b->prev_state = si_b->state;