diff --git a/rpc/client.go b/rpc/client.go
index 984f56bc69..8c8edbbd2f 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -209,9 +209,9 @@ func initClient(conn ServerCodec, idgen func() ID, services *serviceRegistry) *C
 		isHTTP:      isHTTP,
 		services:    services,
 		writeConn:   conn,
-		close:       make(chan struct{}),
-		closing:     make(chan struct{}),
-		didClose:    make(chan struct{}),
+		close:       make(chan struct{}, 1),
+		closing:     make(chan struct{}, 1),
+		didClose:    make(chan struct{}, 1),
 		reconnected: make(chan ServerCodec),
 		readOp:      make(chan readOp),
 		readErr:     make(chan error),
diff --git a/rpc/subscription.go b/rpc/subscription.go
index f9d60dcb98..c5c21f0b70 100644
--- a/rpc/subscription.go
+++ b/rpc/subscription.go
@@ -219,7 +219,7 @@ func newClientSubscription(c *Client, namespace string, channel reflect.Value) *
 		namespace: namespace,
 		etype:     channel.Type().Elem(),
 		channel:   channel,
-		quit:      make(chan struct{}),
+		quit:      make(chan struct{}, 1),
 		err:       make(chan error, 1),
 		in:        make(chan json.RawMessage),
 	}