diff --git a/picoquic/sender.c b/picoquic/sender.c
index 40bcccce6..faffac4d0 100644
--- a/picoquic/sender.c
+++ b/picoquic/sender.c
@@ -3217,6 +3217,13 @@ int picoquic_prepare_packet_almost_ready(picoquic_cnx_t* cnx, picoquic_path_t* p
         }
     }
 
+    if (length == 0 && cnx->local_parameters.max_idle_timeout == 30001 && cnx->client_mode &&
+        cnx->pkt_ctx[picoquic_packet_context_handshake].pending_first != NULL) {
+        picoquic_log_app_message(cnx, "Not repeating handshake, t = %" PRIu64", cnxid: %s, nb_retrans: %" PRIu64 ", wake: % " PRIu64,
+            (current_time - cnx->start_time), (path_x->p_local_cnxid == NULL)?"absent":"present",
+            cnx->path[0]->nb_retransmit, cnx->next_wake_time - cnx->start_time);
+    }
+
     if (length == 0) {
         picoquic_packet_context_t* pkt_ctx = (cnx->is_multipath_enabled) ?
             &path_x->p_remote_cnxid->pkt_ctx : &cnx->pkt_ctx[pc];