diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index b428043..935edae 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -482,7 +482,7 @@
         /* If this is a full handshake with ChannelID then record the hashshake
          * hashes in |s->session| in case we need them to verify a ChannelID
          * signature on a resumption of this session in the future. */
-        if (!s->hit) {
+        if (!s->hit && s->s3->tlsext_channel_id_valid) {
           ret = tls1_record_handshake_hashes_for_channel_id(s);
           if (ret <= 0) {
             goto end;