diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 5007646793..3e01b03b84 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -215,6 +215,8 @@ ServerNetworkGameSocketHandler::~ServerNetworkGameSocketHandler()
 		this->savegame->Destroy();
 		this->savegame = nullptr;
 	}
+
+	InvalidateWindowData(WC_CLIENT_LIST, 0);
 }
 
 bool ServerNetworkGameSocketHandler::ParseKeyPasswordPacket(Packet &p, NetworkSharedSecrets &ss, const std::string &password, std::string *payload, size_t length)
@@ -336,8 +338,6 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::CloseConnection(NetworkRecvSta
 
 	this->DeferDeletion();
 
-	InvalidateWindowData(WC_CLIENT_LIST, 0);
-
 	return status;
 }