diff --git a/core/src/main/java/com/expedia/www/haystack/client/dispatchers/RemoteDispatcher.java b/core/src/main/java/com/expedia/www/haystack/client/dispatchers/RemoteDispatcher.java
index dd42624..2f3a597 100644
--- a/core/src/main/java/com/expedia/www/haystack/client/dispatchers/RemoteDispatcher.java
+++ b/core/src/main/java/com/expedia/www/haystack/client/dispatchers/RemoteDispatcher.java
@@ -82,7 +82,7 @@ public void run() {
             while (running.get() || !(acceptQueue.isEmpty())) {
 
                 try (Sample timer = sendTimer.start()) {
-                    Span span = acceptQueue.take();
+                    Span span = acceptQueue.poll(1000, TimeUnit.MILLISECONDS);
                     try {
                         client.send(span);
                     } catch (ClientException e) {