diff --git a/crypto/trust_token/trust_token.c b/crypto/trust_token/trust_token.c
index 448def8..1ade23e 100644
--- a/crypto/trust_token/trust_token.c
+++ b/crypto/trust_token/trust_token.c
@@ -625,8 +625,13 @@
   assert(strlen(kClientDataLabel) < strlen(kExpiryTimestampLabel));
   assert(strlen(kPublicLabel) < strlen(kPrivateLabel));
 
+  size_t map_entries = 3;
+  if (ctx->method->use_token_hash) {
+    map_entries = 4;
+  }
+
   if (!CBB_init(&srr, 0) ||
-      !add_cbor_map(&srr, 3) ||  // SRR map
+      !add_cbor_map(&srr, map_entries) ||  // SRR map
       !add_cbor_text(&srr, kMetadataLabel, strlen(kMetadataLabel)) ||
       !add_cbor_map(&srr, 2) ||  // Metadata map
       !add_cbor_text(&srr, kPublicLabel, strlen(kPublicLabel)) ||
diff --git a/crypto/trust_token/trust_token_test.cc b/crypto/trust_token/trust_token_test.cc
index bbb7a8a..41bf55d 100644
--- a/crypto/trust_token/trust_token_test.cc
+++ b/crypto/trust_token/trust_token_test.cc
@@ -462,7 +462,7 @@
         "\x65\x73\x74\x61\x6d\x70\x1a\x00\xcc\x15\x7a";
 
     const uint8_t kExpectedSRRTokenHash[] =
-        "\xa3\x68\x6d\x65\x74\x61\x64\x61\x74\x61\xa2\x66\x70\x75\x62\x6c\x69"
+        "\xa4\x68\x6d\x65\x74\x61\x64\x61\x74\x61\xa2\x66\x70\x75\x62\x6c\x69"
         "\x63\x00\x67\x70\x72\x69\x76\x61\x74\x65\x00\x6a\x74\x6f\x6b\x65\x6e"
         "\x2d\x68\x61\x73\x68\x58\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
         "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"