diff --git a/client.go b/client.go
index 24c1450..f4f0af0 100644
--- a/client.go
+++ b/client.go
@@ -335,6 +335,8 @@ func (c *client) query(params *QueryParam) error {
 				inp.sent = true
 				select {
 				case params.Entries <- inp:
+				case <-finish:
+					return nil
 				}
 			} else {
 				// Fire off a node specific query