diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index d5a8e46cb..320a0db0f 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -62,7 +62,7 @@ void JsonRpcConnection::HandleIncomingMessages(boost::asio::yield_context yc)
 {
 	m_Stream->next_layer().SetSeen(&m_Seen);
 
-	for (;;) {
+	while (!m_ShuttingDown) {
 		String message;
 
 		try {