diff --git a/lease/lessor.go b/lease/lessor.go
index 846c3612f87..29a01241650 100644
--- a/lease/lessor.go
+++ b/lease/lessor.go
@@ -627,7 +627,7 @@ func (l *Lease) Remaining() time.Duration {
 	if l.expiry.IsZero() {
 		return time.Duration(math.MaxInt64)
 	}
-	return l.expiry.Sub(time.Now())
+	return time.Until(l.expiry)
 }
 
 type LeaseItem struct {