diff --git a/server.c b/server.c
index a34d9b02..fe07f1a0 100644
--- a/server.c
+++ b/server.c
@@ -207,15 +207,10 @@ error:
 void
 server_loop(void)
 {
-	struct timeval	tv;
-
-	memset(&tv, 0, sizeof tv);
-	tv.tv_usec = POLL_TIMEOUT * 1000;
-
 	while (!server_should_shutdown()) {
 		server_update_socket();
 
-		event_loopexit(&tv);
+		event_loopexit(NULL);
 		event_loop(EVLOOP_ONCE);
 
 		server_window_loop();
diff --git a/tmux.h b/tmux.h
index f1b0f7ac..40bd238b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -62,9 +62,6 @@ extern char   **environ;
 /* Escape timer period, in milliseconds. */
 #define ESCAPE_PERIOD 500
 
-/* Maximum poll timeout (when attached). */
-#define POLL_TIMEOUT 50
-
 /* Maximum data to buffer for output before suspending reading from panes. */
 #define BACKOFF_THRESHOLD 1024