diff --git a/quic/core/qpack/qpack_decoder.cc b/quic/core/qpack/qpack_decoder.cc
index e0d7e20..8638331 100644
--- a/quic/core/qpack/qpack_decoder.cc
+++ b/quic/core/qpack/qpack_decoder.cc
@@ -153,11 +153,14 @@
 
 void QpackDecoder::OnErrorDetected(QuicErrorCode error_code,
                                    absl::string_view error_message) {
-  encoder_stream_error_delegate_->OnEncoderStreamError(
-      GetQuicReloadableFlag(quic_granular_qpack_error_codes)
-          ? error_code
-          : QUIC_QPACK_ENCODER_STREAM_ERROR,
-      error_message);
+  if (GetQuicReloadableFlag(quic_granular_qpack_error_codes)) {
+    QUIC_CODE_COUNT_N(quic_granular_qpack_error_codes, 2, 2);
+    encoder_stream_error_delegate_->OnEncoderStreamError(error_code,
+                                                         error_message);
+  } else {
+    encoder_stream_error_delegate_->OnEncoderStreamError(
+        QUIC_QPACK_ENCODER_STREAM_ERROR, error_message);
+  }
 }
 
 std::unique_ptr<QpackProgressiveDecoder> QpackDecoder::CreateProgressiveDecoder(
diff --git a/quic/core/qpack/qpack_encoder.cc b/quic/core/qpack/qpack_encoder.cc
index 9d96aa9..bf7cdc6 100644
--- a/quic/core/qpack/qpack_encoder.cc
+++ b/quic/core/qpack/qpack_encoder.cc
@@ -441,11 +441,14 @@
 
 void QpackEncoder::OnErrorDetected(QuicErrorCode error_code,
                                    absl::string_view error_message) {
-  decoder_stream_error_delegate_->OnDecoderStreamError(
-      GetQuicReloadableFlag(quic_granular_qpack_error_codes)
-          ? error_code
-          : QUIC_QPACK_DECODER_STREAM_ERROR,
-      error_message);
+  if (GetQuicReloadableFlag(quic_granular_qpack_error_codes)) {
+    QUIC_CODE_COUNT_N(quic_granular_qpack_error_codes, 1, 2);
+    decoder_stream_error_delegate_->OnDecoderStreamError(error_code,
+                                                         error_message);
+  } else {
+    decoder_stream_error_delegate_->OnDecoderStreamError(
+        QUIC_QPACK_DECODER_STREAM_ERROR, error_message);
+  }
 }
 
 }  // namespace quic