diff --git a/src/main_server.c b/src/main_server.c
index f2b4792..892cd70 100644
--- a/src/main_server.c
+++ b/src/main_server.c
@@ -25,6 +25,8 @@ int metadata_server_main(int argc, char **argv)
     if (num_polled < 0) return -1;
     for (;;) {
         POLL(polled, num_polled, timeout);
+
+        timeout = -1;
         num_polled = metadata_server_step(
             &state, contexts, polled, num_polled, &timeout);
         if (num_polled < 0) return -1;
@@ -44,7 +46,10 @@ int chunk_server_main(int argc, char **argv)
         &state, argc, argv, contexts, polled, &timeout);
     if (num_polled < 0) return -1;
     for (;;) {
+
         POLL(polled, num_polled, timeout);
+
+        timeout = -1;
         num_polled = chunk_server_step(
             &state, contexts, polled, num_polled, &timeout);
         if (num_polled < 0) return -1;