diff --git a/include/proto/connection.h b/include/proto/connection.h
index cae5dc343..4c952e034 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -694,12 +694,7 @@ static inline void conn_free(struct connection *conn)
 /* Release a conn_stream, and kill the connection if it was the last one */
 static inline void cs_destroy(struct conn_stream *cs)
 {
-	struct connection *conn = cs->conn;
-
-	LIST_DEL(&conn->list);
-	conn_stop_tracking(conn);
-	conn_full_close(conn);
-	conn_free(conn);
+	cs->conn->mux->detach(cs);
 	cs_free(cs);
 }
 
diff --git a/src/mux_pt.c b/src/mux_pt.c
index e9a7d2f8c..8a8aec088 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -113,11 +113,16 @@ static struct conn_stream *mux_pt_attach(struct connection *conn)
 }
 
 /*
- * Detach the stream from the connection
- * (Used for outgoing connections)
+ * Detach the stream from the connection and possibly release the connection.
  */
 static void mux_pt_detach(struct conn_stream *cs)
 {
+	struct connection *conn = cs->conn;
+
+	LIST_DEL(&conn->list);
+	conn_stop_tracking(conn);
+	conn_full_close(conn);
+	conn_free(conn);
 }
 
 static void mux_pt_shutr(struct conn_stream *cs, enum cs_shr_mode mode)