diff --git a/lib/handshake.c b/lib/handshake.c
index 421494a2..b1c7d99d 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -68,6 +68,8 @@ libwebsocket_read(struct libwebsocket_context *context,
 	switch (wsi->state) {
 http_new:
 	case WSI_STATE_HTTP:
+		wsi->hdr_parsing_completed = 0;
+		/* fallthru */
 	case WSI_STATE_HTTP_ISSUING_FILE:
 		wsi->state = WSI_STATE_HTTP_HEADERS;
 		wsi->u.hdr.parser_state = WSI_TOKEN_NAME_PART;