diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
index 66bb75b131..b439242cd5 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpClientContext.cs
@@ -516,7 +516,7 @@ namespace OSHttpServer
             ContextTimeoutManager.EnqueueSend(this, m_currentResponse.Priority, notThrottled);
         }
 
-        public async Task EndSendResponse(uint requestID, ConnectionType ctype)
+        public void EndSendResponse(uint requestID, ConnectionType ctype)
         {
             isSendingResponse = false;
             m_currentResponse?.Clear();
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpResponse.cs
index 91601940e6..625fbef4d3 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpResponse.cs
@@ -469,7 +469,7 @@ namespace OSHttpServer
             if (m_body != null)
                 m_body.Dispose();
             Sent = true;
-            await m_context.EndSendResponse(requestID, Connection).ConfigureAwait(false);
+            m_context.EndSendResponse(requestID, Connection);
         }
 
         private int CheckBandwidth(int request, int bytesLimit)
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/IHttpClientContext.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/IHttpClientContext.cs
index a11fad2c47..2af6c49de6 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/IHttpClientContext.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/IHttpClientContext.cs
@@ -96,7 +96,7 @@ namespace OSHttpServer
 
         void StartSendResponse(HttpResponse response);
         void ContinueSendResponse(bool notThrottled);
-        Task EndSendResponse(uint requestID, ConnectionType connection);
+        void EndSendResponse(uint requestID, ConnectionType connection);
         bool TrySendResponse(int limit);
     }