diff --git a/src/main/java/net/pms/network/mediaserver/servlets/MediaServerServlet.java b/src/main/java/net/pms/network/mediaserver/servlets/MediaServerServlet.java
index e59e9e0aa3c..0ebaef67774 100644
--- a/src/main/java/net/pms/network/mediaserver/servlets/MediaServerServlet.java
+++ b/src/main/java/net/pms/network/mediaserver/servlets/MediaServerServlet.java
@@ -271,6 +271,9 @@ private static void sendResponse(HttpServletRequest req, HttpServletResponse res
 			OutputStream os = new BufferedOutputStream(resp.getOutputStream(), BUFFER_SIZE);
 			copyStreamAsync(inputStream, os, async);
 		} else {
+			if (HEAD.equalsIgnoreCase(req.getMethod()) && contentLength < 1) {
+				resp.flushBuffer();
+			}
 			try {
 				inputStream.close();
 			} catch (IOException ioe) {