diff --git a/clientv3/lease.go b/clientv3/lease.go
index 3f8edf4ff..e27e2b04a 100644
--- a/clientv3/lease.go
+++ b/clientv3/lease.go
@@ -355,6 +355,8 @@ func (l *lessor) sendKeepAliveLoop(stream pb.Lease_LeaseKeepAliveClient) {
 	for {
 		select {
 		case <-time.After(500 * time.Millisecond):
+		case <-stream.Context().Done():
+			return
 		case <-l.donec:
 			return
 		case <-l.stopCtx.Done():