diff --git a/overlay.c b/overlay.c
index 30ca8adf..7e32d987 100644
--- a/overlay.c
+++ b/overlay.c
@@ -235,6 +235,7 @@ int overlayServerMode()
 	DEBUGF("Waiting via poll() for up to %lldms", ms);
       TIMING_PAUSE();
       
+      if (ms>15000) ms=15000;
       r = poll(fds, fdcount, ms);
       
       TIMING_CHECK();