diff --git a/client/xclient.go b/client/xclient.go
index fb163da4..ba179e41 100644
--- a/client/xclient.go
+++ b/client/xclient.go
@@ -1196,6 +1196,8 @@ loop:
 	for {
 		select {
 		case <-ctx.Done():
+			err = ctx.Err()
+			break loop
 		default:
 			if tb != nil {
 				tb.Wait(FileTransferBufferSize)
@@ -1257,6 +1259,8 @@ loop:
 	for {
 		select {
 		case <-ctx.Done():
+			err = ctx.Err()
+			break loop
 		default:
 			n, er := r.Read(buf)
 			if n > 0 {