diff --git a/klippy/serialqueue.c b/klippy/serialqueue.c
index ceb90672..afdcc297 100644
--- a/klippy/serialqueue.c
+++ b/klippy/serialqueue.c
@@ -517,7 +517,8 @@ handle_message(struct serialqueue *sq, double eventtime, int len)
     if (len > MESSAGE_MIN) {
         // Add message to receive queue
         struct queue_message *qm = message_fill(sq->input_buf, len);
-        qm->sent_time = sq->last_receive_sent_time;
+        qm->sent_time = (rseq > sq->retransmit_seq
+                         ? sq->last_receive_sent_time : 0.);
         qm->receive_time = get_monotonic(); // must be time post read()
         qm->receive_time -= sq->baud_adjust * len;
         list_add_tail(&qm->node, &sq->receive_queue);