diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 099479c158..0db16a5660 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -216,6 +216,8 @@ ServerNetworkGameSocketHandler::~ServerNetworkGameSocketHandler()
 		this->savegame->Destroy();
 		this->savegame = nullptr;
 	}
+
+	InvalidateWindowData(WC_CLIENT_LIST, 0);
 }
 
 std::unique_ptr<Packet> ServerNetworkGameSocketHandler::ReceivePacket()
@@ -279,8 +281,6 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta
 
 	this->DeferDeletion();
 
-	InvalidateWindowData(WC_CLIENT_LIST, 0);
-
 	return status;
 }