diff --git a/src/main/java/org/archive/format/http/HttpHeaderParser.java b/src/main/java/org/archive/format/http/HttpHeaderParser.java
index d63ec405..bee3c28b 100755
--- a/src/main/java/org/archive/format/http/HttpHeaderParser.java
+++ b/src/main/java/org/archive/format/http/HttpHeaderParser.java
@@ -301,8 +301,9 @@ public ParseState handleByte(byte b, HttpHeaderParser parser) throws HttpParseEx
 			if(isLWSP(b)) {
 				return parser.postColonState;
 			}
+			// reset previous value also in case the header value is empty
+			parser.setValueStartIdx();
 			if(b == CR) {
-				// TODO: THINK more...
 				parser.valuePreCRState = parser.postColonState;
 				return parser.valuePostCRState;
 			}
@@ -310,7 +311,6 @@ public ParseState handleByte(byte b, HttpHeaderParser parser) throws HttpParseEx
 				// TODO: this is lax, is LFLF an OK terminator?
 				return parser.lineStartState;
 			}
-			parser.setValueStartIdx();
 			parser.addValueByte(b);
 			return parser.valueState;
 		}
diff --git a/src/test/java/org/archive/format/http/HttpResponseParserTest.java b/src/test/java/org/archive/format/http/HttpResponseParserTest.java
index c0d13230..ea076a69 100644
--- a/src/test/java/org/archive/format/http/HttpResponseParserTest.java
+++ b/src/test/java/org/archive/format/http/HttpResponseParserTest.java
@@ -57,4 +57,28 @@ public void testParseWithLf() throws IOException {
 		
 	}
 
+	public void testParseEmptyHeaderField() throws IOException {
+
+		HttpResponseParser parser = new HttpResponseParser();
+		String message = "200 OK\r\nContent-Type: text/plain\r\nServer: \r\n\r\nHi there";
+		try {
+			HttpResponse response = 
+				parser.parse(new ByteArrayInputStream(message.getBytes(IAUtils.UTF8)));
+			assertNotNull(response);
+			HttpHeaders headers = response.getHeaders();
+			assertNotNull(headers);
+			assertEquals(2, headers.size());
+			HttpHeader header = headers.get(1);
+			assertEquals("Server",header.getName());
+			System.err.println(header.getValue());
+			assertFalse("text/plain".equals(header.getValue()));
+			TestUtils.assertStreamEquals(response, "Hi there".getBytes(IAUtils.UTF8));
+			
+		} catch (HttpParseException e) {
+			e.printStackTrace();
+			fail();
+		}
+		
+	}
+
 }