diff --git a/cli/ping.go b/cli/ping.go
index f75ed42d26362..ec094ea1a317b 100644
--- a/cli/ping.go
+++ b/cli/ping.go
@@ -53,7 +53,7 @@ func (s *pingSummary) addResult(r *ipnstate.PingResult) {
 	if s.Min == nil || r.LatencySeconds < s.Min.Seconds() {
 		s.Min = ptr.Ref(time.Duration(r.LatencySeconds * float64(time.Second)))
 	}
-	if s.Max == nil || r.LatencySeconds > s.Min.Seconds() {
+	if s.Max == nil || r.LatencySeconds > s.Max.Seconds() {
 		s.Max = ptr.Ref(time.Duration(r.LatencySeconds * float64(time.Second)))
 	}
 	s.latencySum += r.LatencySeconds
diff --git a/cli/ping_internal_test.go b/cli/ping_internal_test.go
index 0c131fadfa52a..5448d29f32133 100644
--- a/cli/ping_internal_test.go
+++ b/cli/ping_internal_test.go
@@ -21,11 +21,11 @@ func TestBuildSummary(t *testing.T) {
 			},
 			{
 				Err:            "",
-				LatencySeconds: 0.2,
+				LatencySeconds: 0.3,
 			},
 			{
 				Err:            "",
-				LatencySeconds: 0.3,
+				LatencySeconds: 0.2,
 			},
 			{
 				Err:            "ping error",