diff --git a/include/haproxy/quic_frame-t.h b/include/haproxy/quic_frame-t.h
index 86705e36c..c94aff0f5 100644
--- a/include/haproxy/quic_frame-t.h
+++ b/include/haproxy/quic_frame-t.h
@@ -32,7 +32,6 @@
 #include <import/ebtree-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/list.h>
-#include <haproxy/quic_stream-t.h>
 #include <haproxy/quic_token.h>
 
 extern struct pool_head *pool_head_quic_frame;
@@ -170,7 +169,7 @@ struct qf_new_token {
 
 struct qf_stream {
 	uint64_t id;
-	struct qc_stream_desc *stream;
+	void *stream;
 
 	/* used only on TX when constructing frames.
 	 * Data cleared when processing ACK related to this STREAM frame.
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 1abc8a407..2c36d8d9d 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -2499,7 +2499,8 @@ static int qcs_build_stream_frm(struct qcs *qcs, struct buffer *out, char fin,
 		goto err;
 	}
 
-	frm->stream.stream = qcs->tx.stream;
+	frm->stream.stream =
+	  conn_is_quic(qcc->conn) ? (void *)qcs->tx.stream : (void *)qcs;
 	frm->stream.id = qcs->id;
 	frm->stream.offset = 0;
 	frm->stream.dup = 0;