diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 04a25fdac0..396010b59a 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -83,7 +83,7 @@ struct PacketWriter : SaveFilter {
 	{
 		std::unique_lock<std::mutex> lock(this->mutex);
 
-		if (this->cs != nullptr) this->exit_sig.wait(lock);
+		while (this->cs != nullptr) this->exit_sig.wait(lock);
 
 		/* This must all wait until the Destroy function is called. */