diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index eba49e4dd3..952fb31263 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -222,7 +222,8 @@ namespace OpenSim.Framework.Servers
 
                     request.InputStream.Close();
                     if (!response.IsContentTypeSet) response.ContentType = requestHandler.ContentType;
-                    response.ContentLength64 = buffer.LongLength;
+                    if (!response.SendChunked)
+                        response.ContentLength64 = buffer.LongLength;
 
                     try
                     {