diff --git a/src/h3.c b/src/h3.c
index f5da7613a..fe3ae1384 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -321,6 +321,10 @@ static int h3_decode_qcs(struct qcs *qcs, int fin, void *ctx)
 		h3s->demux_frame_len -= ret;
 	}
 
+	/* TODO may be useful to wakeup the MUX if blocked due to full buffer.
+	 * However, currently, io-cb of MUX does not handle Rx.
+	 */
+
 	return 0;
 }
 
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 773b62b0d..582088649 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2139,7 +2139,7 @@ static int qc_handle_bidi_strm_frm(struct quic_rx_packet *pkt,
 	struct quic_rx_strm_frm *frm;
 	struct eb64_node *frm_node;
 	struct qcs *qcs = NULL;
-	size_t done;
+	size_t done, buf_was_full;
 	int ret;
 
 	ret = qcc_recv(qc->qcc, strm_frm->id, strm_frm->len,
@@ -2176,6 +2176,13 @@ static int qc_handle_bidi_strm_frm(struct quic_rx_packet *pkt,
 			return 1;
 	}
 
+	/* Decode the data if buffer is already full as it's not possible to
+	 * dequeue a frame in this condition.
+	 */
+	if (b_full(&qcs->rx.buf))
+		qcc_decode_qcs(qc->qcc, qcs);
+
+ retry:
 	/* Frame received (partially or not) by the mux.
 	 * If there is buffered frame for next offset, it may be possible to
 	 * receive them now.
@@ -2212,9 +2219,17 @@ static int qc_handle_bidi_strm_frm(struct quic_rx_packet *pkt,
 		pool_free(pool_head_quic_rx_strm_frm, frm);
 	}
 
+	buf_was_full = b_full(&qcs->rx.buf);
 	/* Decode the received data. */
 	qcc_decode_qcs(qc->qcc, qcs);
 
+	/* Buffer was full so the reception was stopped. Now the buffer has
+	 * space available thanks to qcc_decode_qcs(). We can now retry to
+	 * handle more data.
+	 */
+	if (buf_was_full && !b_full(&qcs->rx.buf))
+		goto retry;
+
 	return 1;
 }