diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 8ec0b9253..faf3debc9 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -65,7 +65,6 @@ void HttpServerConnection::Start()
 
 	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { ProcessMessages(yc); });
 	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { CheckLiveness(yc); });
-	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { CheckStream(yc); });
 }
 
 /**
@@ -513,21 +512,3 @@ void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
 		}
 	}
 }
-
-/**
- * Checks if the @c AsioTlsStream has been closed to shut down the connection.
- *
- * @param yc The yield context for the coroutine of this function
- */
-void HttpServerConnection::CheckStream(boost::asio::yield_context yc)
-{
-	using wait_type = boost::asio::socket_base::wait_type;
-
-	while(!m_ShuttingDown){
-		boost::system::error_code ec;
-		m_Stream->async_fill(yc[ec]);
-		if (ec) {
-			Disconnect(yc);
-		}
-	}
-}
diff --git a/lib/remote/httpserverconnection.hpp b/lib/remote/httpserverconnection.hpp
index 79ab1ae07..2e3fda453 100644
--- a/lib/remote/httpserverconnection.hpp
+++ b/lib/remote/httpserverconnection.hpp
@@ -49,7 +49,6 @@ private:
 
 	void ProcessMessages(boost::asio::yield_context yc);
 	void CheckLiveness(boost::asio::yield_context yc);
-	void CheckStream(boost::asio::yield_context yc);
 };
 
 }