diff --git a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
index baa5b08883..e301f0496e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
@@ -270,7 +270,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 }
 
                 httpListenerResponse.ContentLength64 = stream.Length;
-                return new StreamWriter(stream, Logger);
+                return headersOnly ? null : new StreamWriter(stream, Logger);
+            }
+
+            if (headersOnly)
+            {
+                return null;
             }
 
             string content;