diff --git a/http.c b/http.c
index c92f60fc..53943c78 100644
--- a/http.c
+++ b/http.c
@@ -2335,7 +2335,7 @@ evhttp_parse_query(const char *uri, struct evkeyvalq *headers)
 
 		value = argument;
 		key = strsep(&value, "=");
-		if (value == NULL)
+		if (value == NULL || *key == '\0')
 			goto error;
 
 		if ((decoded_value = mm_malloc(strlen(value) + 1)) == NULL) {