diff --git a/reg-tests/connection/h2_glitches.vtc b/reg-tests/connection/h2_glitches.vtc
index 39ec4d685..4f25164d0 100644
--- a/reg-tests/connection/h2_glitches.vtc
+++ b/reg-tests/connection/h2_glitches.vtc
@@ -11,7 +11,9 @@ haproxy hap -conf {
 
 	listen fe1
 		bind "fd@${fe1}" proto h2
-		http-request return status 200 hdr x-glitches %[fc_glitches]
+		tcp-request session track-sc0 src
+		http-request return status 200 hdr x-glitches %[fc_glitches] hdr x-glitch-cnt %[sc0_glitch_cnt] hdr x-glitch-rate %[sc0_glitch_rate]
+		stick-table type ip size 10 store glitch_cnt,glitch_rate(1m)
 } -start
 
 # valid request: no glitch
@@ -73,6 +75,8 @@ client c2-path -connect ${hap_fe1_sock} {
 		rxresp
 		expect resp.status == 200
 		expect resp.http.x-glitches == 1
+		expect resp.http.x-glitch-cnt == 1
+		expect resp.http.x-glitch-rate == 1
 	} -run
 } -run
 
@@ -104,5 +108,7 @@ client c3-scheme -connect ${hap_fe1_sock} {
 		rxresp
 		expect resp.status == 200
 		expect resp.http.x-glitches == 0
+		expect resp.http.x-glitch-cnt == 1
+		expect resp.http.x-glitch-rate == 1
 	} -run
 } -run
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4925d8d15..94724a2f9 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -4364,8 +4364,13 @@ static int h2_process(struct h2c *h2c)
 
 	if (!(h2c->flags & H2_CF_DEM_BLOCK_ANY) &&
 	    (b_data(&h2c->dbuf) || (h2c->flags & H2_CF_RCVD_SHUT))) {
+		int prev_glitches = h2c->glitches;
+
 		h2_process_demux(h2c);
 
+		if (h2c->glitches != prev_glitches && !(h2c->flags & H2_CF_IS_BACK))
+			session_add_glitch_ctr(h2c->conn->owner, h2c->glitches - prev_glitches);
+
 		if (h2c->st0 >= H2_CS_ERROR || (h2c->flags & H2_CF_ERROR))
 			b_reset(&h2c->dbuf);