diff --git a/lib/remote/httpresponse.cpp b/lib/remote/httpresponse.cpp
index 45ac25c81..cfe99d608 100644
--- a/lib/remote/httpresponse.cpp
+++ b/lib/remote/httpresponse.cpp
@@ -111,9 +111,6 @@ void HttpResponse::Finish()
 	}
 
 	m_State = HttpResponseEnd;
-
-	if (m_Request->ProtocolVersion == HttpVersion10 || m_Request->Headers->Get("connection") == "close")
-		m_Stream->Shutdown();
 }
 
 bool HttpResponse::Parse(StreamReadContext& src, bool may_wait)
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 497ce7b83..aa960c25b 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -357,6 +357,13 @@ void HttpServerConnection::DataAvailableHandler()
 		}
 
 		m_RequestQueue.Enqueue(std::bind(&Stream::SetCorked, m_Stream, false));
+
+		/* Request finished, decide whether to explicitly close the connection. */
+		if (m_CurrentRequest.ProtocolVersion == HttpVersion10 ||
+			m_CurrentRequest.Headers->Get("connection") == "close") {
+			m_Stream->Shutdown();
+			close = true;
+		}
 	} else
 		close = true;