diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index b9a8ab814d..65f7c81b12 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -68,44 +68,42 @@ void HttpServerConnection::Start()
 	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) { CheckLiveness(yc); });
 }
 
-void HttpServerConnection::Disconnect()
+void HttpServerConnection::Disconnect(boost::asio::yield_context yc)
 {
 	namespace asio = boost::asio;
 
-	HttpServerConnection::Ptr keepAlive (this);
+	if (m_ShuttingDown) {
+		return;
+	}
 
-	IoEngine::SpawnCoroutine(m_IoStrand, [this, keepAlive](asio::yield_context yc) {
-		if (!m_ShuttingDown) {
-			m_ShuttingDown = true;
+	m_ShuttingDown = true;
 
-			Log(LogInformation, "HttpServerConnection")
-				<< "HTTP client disconnected (from " << m_PeerAddress << ")";
-
-			/*
-			 * Do not swallow exceptions in a coroutine.
-			 * https://github.com/Icinga/icinga2/issues/7351
-			 * We must not catch `detail::forced_unwind exception` as
-			 * this is used for unwinding the stack.
-			 *
-			 * Just use the error_code dummy here.
-			 */
-			boost::system::error_code ec;
+	Log(LogInformation, "HttpServerConnection")
+		<< "HTTP client disconnected (from " << m_PeerAddress << ")";
+
+	/*
+	 * Do not swallow exceptions in a coroutine.
+	 * https://github.com/Icinga/icinga2/issues/7351
+	 * We must not catch `detail::forced_unwind exception` as
+	 * this is used for unwinding the stack.
+	 *
+	 * Just use the error_code dummy here.
+	 */
+	boost::system::error_code ec;
 
-			m_CheckLivenessTimer.cancel();
+	m_CheckLivenessTimer.cancel();
 
-			m_Stream->lowest_layer().cancel(ec);
+	m_Stream->lowest_layer().cancel(ec);
 
-			m_Stream->next_layer().async_shutdown(yc[ec]);
+	m_Stream->next_layer().async_shutdown(yc[ec]);
 
-			m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both, ec);
+	m_Stream->lowest_layer().shutdown(m_Stream->lowest_layer().shutdown_both, ec);
 
-			auto listener (ApiListener::GetInstance());
+	auto listener (ApiListener::GetInstance());
 
-			if (listener) {
-				listener->RemoveHttpClient(this);
-			}
-		}
-	});
+	if (listener) {
+		listener->RemoveHttpClient(this);
+	}
 }
 
 void HttpServerConnection::StartStreaming()
@@ -126,7 +124,7 @@ void HttpServerConnection::StartStreaming()
 				m_Stream->async_read_some(readBuf, yc[ec]);
 			} while (!ec);
 
-			Disconnect();
+			Disconnect(yc);
 		}
 	});
 }
@@ -563,7 +561,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
 		}
 	}
 
-	Disconnect();
+	Disconnect(yc);
 }
 
 void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
@@ -582,7 +580,7 @@ void HttpServerConnection::CheckLiveness(boost::asio::yield_context yc)
 			Log(LogInformation, "HttpServerConnection")
 				<<  "No messages for HTTP connection have been received in the last 10 seconds.";
 
-			Disconnect();
+			Disconnect(yc);
 			break;
 		}
 	}
diff --git a/lib/remote/httpserverconnection.hpp b/lib/remote/httpserverconnection.hpp
index 9c812e526b..fb6c1372e5 100644
--- a/lib/remote/httpserverconnection.hpp
+++ b/lib/remote/httpserverconnection.hpp
@@ -28,7 +28,7 @@ class HttpServerConnection final : public Object
 	HttpServerConnection(const String& identity, bool authenticated, const Shared<AsioTlsStream>::Ptr& stream);
 
 	void Start();
-	void Disconnect();
+	void Disconnect(boost::asio::yield_context yc);
 	void StartStreaming();
 
 	bool Disconnected();