diff --git a/ffserver.c b/ffserver.c
index d665f4ef505cc45dcc9a0bdf6a217ef5ebb111ef..9587d7bbddddd149272492da58b31ac4247e4a41 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -534,7 +534,6 @@ static int http_server(void)
 
     first_http_ctx = NULL;
     nb_connections = 0;
-    first_http_ctx = NULL;
 
     start_multicast();
 
@@ -681,8 +680,6 @@ static void new_connection(int server_fd, int is_rtsp)
     if (!c)
         goto fail;
     
-    c->next = first_http_ctx;
-    first_http_ctx = c;
     c->fd = fd;
     c->poll_entry = NULL;
     c->from_addr = from_addr;
@@ -690,6 +687,9 @@ static void new_connection(int server_fd, int is_rtsp)
     c->buffer = av_malloc(c->buffer_size);
     if (!c->buffer)
         goto fail;
+
+    c->next = first_http_ctx;
+    first_http_ctx = c;
     nb_connections++;
     
     start_wait_request(c, is_rtsp);