diff --git a/src/client.c b/src/client.c
index c72f7e4e5..e4babba08 100644
--- a/src/client.c
+++ b/src/client.c
@@ -252,6 +252,7 @@ int event_accept(int fd) {
 				pool_free(session, s);
 				return 0;
 			}
+			hdr_idx_init(&hreq->hdr_idx);
 		}
 
 		if ((p->mode == PR_MODE_TCP || p->mode == PR_MODE_HTTP)
diff --git a/src/proto_http.c b/src/proto_http.c
index 94d354cba..5aad97d04 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -906,7 +906,9 @@ void http_msg_analyzer(struct buffer *buf, struct http_msg *msg, struct hdr_idx
 				end = buf->r;
 #endif
 			}
-			hdr_idx_init(idx);
+			/* we will need this when keep-alive will be supported
+			   hdr_idx_init(idx);
+			 */
 			state = HTTP_MSG_RQMETH;
 			goto http_msg_rqmeth;
 		}