diff --git a/trunk/darkhttpd.c b/trunk/darkhttpd.c
index 4fa72a6..7aa952b 100644
--- a/trunk/darkhttpd.c
+++ b/trunk/darkhttpd.c
@@ -1818,6 +1818,7 @@ static void httpd_poll(void)
         switch (conn->state)
         {
         case RECV_REQUEST:
+        recv_request:
             MAX_FD_SET(conn->socket, &recv_set);
             bother_with_timeout = 1;
             break;
@@ -1840,8 +1841,7 @@ static void httpd_poll(void)
             {
                 recycle_connection(conn);
                 /* And enqueue as RECV_REQUEST. */
-                MAX_FD_SET(conn->socket, &recv_set);
-                bother_with_timeout = 1;
+                goto recv_request;
             }
             break;