diff --git a/dist/client.py b/dist/client.py
index 9458cf4..7dce37f 100644
--- a/dist/client.py
+++ b/dist/client.py
@@ -30,7 +30,7 @@ class RenderClient(object):
         self.rsock.setsockopt(zmq.IDENTITY, self.cid)
         self.rsock.connect(rsp_addr)
 
-        self.tq = queue.Queue(0)
+        self.tq = queue.Channel()
 
         self.taskmap = weakref.WeakValueDictionary()
         if start: self.start()
diff --git a/dist/server.py b/dist/server.py
index 6159ba9..8f4dcf8 100644
--- a/dist/server.py
+++ b/dist/server.py
@@ -93,7 +93,7 @@ def setup_responder(addrs, rq):
 
 def main(addrs):
     # Channel holding (addr, task) pairs.
-    tq = queue.Queue(0)
+    tq = queue.Channel()
     # Queue holding response messages (as a list of raw zmq frames).
     rq = queue.Queue()