diff --git a/src/proto_http.c b/src/proto_http.c
index 06a0372..c0be289 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -4448,11 +4448,6 @@
 	s->flags &= ~(SN_DIRECT|SN_ASSIGNED|SN_ADDR_SET|SN_BE_ASSIGNED|SN_FORCE_PRST|SN_IGNORE_PRST);
 	s->flags &= ~(SN_CURR_SESS|SN_REDIRECTABLE|SN_SRV_REUSED);
 
-	if (s->flags & SN_COMP_READY)
-		s->comp_algo->end(&s->comp_ctx);
-	s->comp_algo = NULL;
-	s->flags &= ~SN_COMP_READY;
-
 	s->txn.meth = 0;
 	http_reset_txn(s);
 	s->txn.flags |= TX_NOT_FIRST | TX_WAIT_NEXT_RQ;
@@ -8243,6 +8238,12 @@
 {
 	struct http_txn *txn = &s->txn;
 
+	/* release any possible compression context */
+	if (s->flags & SN_COMP_READY)
+		s->comp_algo->end(&s->comp_ctx);
+	s->comp_algo = NULL;
+	s->flags &= ~SN_COMP_READY;
+
 	/* these ones will have been dynamically allocated */
 	pool_free2(pool2_requri, txn->uri);
 	pool_free2(pool2_capture, txn->cli_cookie);
diff --git a/src/session.c b/src/session.c
index b3da759..7eeb6aa 100644
--- a/src/session.c
+++ b/src/session.c
@@ -602,11 +602,6 @@
 		sess_change_server(s, NULL);
 	}
 
-	if (s->flags & SN_COMP_READY)
-		s->comp_algo->end(&s->comp_ctx);
-	s->comp_algo = NULL;
-	s->flags &= ~SN_COMP_READY;
-
 	if (s->req->pipe)
 		put_pipe(s->req->pipe);