diff --git a/lib/ngtcp2_conn.c b/lib/ngtcp2_conn.c
index 73b8a566c5187411d93aa64d1454cc62b5ebff13..6d7faf63dc5ee2da27765d3598a276b8ded05e51 100644
--- a/lib/ngtcp2_conn.c
+++ b/lib/ngtcp2_conn.c
@@ -9184,8 +9184,9 @@ void ngtcp2_conn_update_rtt(ngtcp2_conn *conn, ngtcp2_duration rtt,
 
   rtt = ngtcp2_max(rtt, NGTCP2_GRANULARITY);
 
+  cstat->latest_rtt = rtt;
+
   if (cstat->min_rtt == UINT64_MAX) {
-    cstat->latest_rtt = rtt;
     cstat->min_rtt = rtt;
     cstat->smoothed_rtt = rtt;
     cstat->rttvar = rtt / 2;
@@ -9201,8 +9202,6 @@ void ngtcp2_conn_update_rtt(ngtcp2_conn *conn, ngtcp2_duration rtt,
       rtt -= ack_delay;
     }
 
-    cstat->latest_rtt = rtt;
-
     cstat->rttvar = (cstat->rttvar * 3 + (cstat->smoothed_rtt < rtt
                                               ? rtt - cstat->smoothed_rtt
                                               : cstat->smoothed_rtt - rtt)) /