diff --git a/src/proto_http.c b/src/proto_http.c
index 865eaa494..f8b46f661 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -475,8 +475,10 @@ char *find_hdr_value_end(char *s, const char *e)
 	quoted = qdpair = 0;
 	for (; s < e; s++) {
 		if (qdpair)                    qdpair = 0;
-		else if (quoted && *s == '\\') qdpair = 1;
-		else if (quoted && *s == '"')  quoted = 0;
+		else if (quoted) {
+			if (*s == '\\')        qdpair = 1;
+			else if (*s == '"')    quoted = 0;
+		}
 		else if (*s == '"')            quoted = 1;
 		else if (*s == ',')            return s;
 	}