2 files changed, 1 insertions, 2 deletions
diff --git a/logger.c b/logger.c
index cb92d64..4a38734 100644
--- a/logger.c
+++ b/logger.c
@@ -447,7 +447,7 @@ static int logger_thread_poll_watchers(int force_poll, int watcher) {
     nfd = 0;
     for (x = 0; x < WATCHER_LIMIT; x++) {
         logger_watcher *w = watchers[x];
-        if (w == NULL)
+        if (w == NULL || (watcher != WATCHER_ALL && x != watcher))
             continue;
 
         data_size = 0;
diff --git a/t/watcher.t b/t/watcher.t
index c34e896..6661326 100644
--- a/t/watcher.t
+++ b/t/watcher.t
@@ -85,7 +85,6 @@ if ($res eq "STORED\r\n") {
     # wait for all of the writes to go through.
     print $client "version\r\n";
     $res = <$client>;
-    sleep 4;
 
     my $mwatcher = $server->new_sock;
     print $mwatcher "watch mutations evictions\n";