diff --git a/src/proto_htx.c b/src/proto_htx.c
index c5cc70c..d69a3fb 100644
--- a/src/proto_htx.c
+++ b/src/proto_htx.c
@@ -1420,14 +1420,14 @@
 	res->flags &= ~(CF_READ_ERROR | CF_READ_TIMEOUT | CF_SHUTR | CF_EOI | CF_READ_NULL | CF_SHUTR_NOW);
 	res->analysers = 0;
 	si->flags &= ~(SI_FL_ERR | SI_FL_EXP | SI_FL_RXBLK_SHUT);
-	s->flags &= ~SF_ADDR_SET;
+	si->err_type = SI_ET_NONE;
+	s->flags &= ~(SF_ERR_MASK | SF_FINST_MASK);
 	stream_choose_redispatch(s);
 	si->exp = TICK_ETERNITY;
 	res->rex = TICK_ETERNITY;
 	res->to_forward = 0;
 	res->analyse_exp = TICK_ETERNITY;
 	res->total = 0;
-	s->flags &= ~SF_ERR_MASK;
 	si_release_endpoint(&s->si[1]);
 	b_free(&req->buf);
 	/* Swap the L7 buffer with the channel buffer */