diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
index 69f62407f8..02c961cbcd 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -556,7 +556,7 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 	 */
 	public MediaType getContentType() {
 		String value = getFirst(CONTENT_TYPE);
-		return (value != null ? MediaType.parseMediaType(value) : null);
+		return (StringUtils.hasLength(value) ? MediaType.parseMediaType(value) : null);
 	}
 
 	/**