diff --git a/trunk/darkhttpd.c b/trunk/darkhttpd.c
index 7ff9315..4013289 100644
--- a/trunk/darkhttpd.c
+++ b/trunk/darkhttpd.c
@@ -2341,7 +2341,8 @@ static void httpd_poll(void)
     /* poll connections that select() says need attention */
     if (FD_ISSET(sockin, &recv_set)) accept_connection();
 
-    LIST_FOREACH(conn, &connlist, entries) {
+    LIST_FOREACH_SAFE(conn, &connlist, entries, next)
+    {
         switch (conn->state)
         {
         case RECV_REQUEST: