diff --git a/src/h2.c b/src/h2.c
index 9cc006ea9..64c23d474 100644
--- a/src/h2.c
+++ b/src/h2.c
@@ -861,8 +861,8 @@ int h2_make_htx_trailers(struct http_hdr *list, struct htx *htx)
 			goto fail;
 	}
 
-	/* Check the number of blocks against "tune.http.maxhdr" value before adding EOT block */
-	if (htx_nbblks(htx) > global.tune.max_http_hdr)
+	/* Check the number of trailers against "tune.http.maxhdr" value before adding EOT block */
+	if (idx > global.tune.max_http_hdr)
 		goto fail;
 
 	if (!htx_add_endof(htx, HTX_BLK_EOT))
diff --git a/src/h3.c b/src/h3.c
index 0b7c53303..09634f14c 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -1505,7 +1505,7 @@ static ssize_t h3_trailers_to_htx(struct qcs *qcs, const struct buffer *buf,
 	}
 
 	/* Check the number of blocks against "tune.http.maxhdr" value before adding EOT block */
-	if (htx_nbblks(htx) > global.tune.max_http_hdr) {
+	if (hdr_idx > global.tune.max_http_hdr) {
 		len = -1;
 		goto out;
 	}