diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 001e757193..8b03dc7fde 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -1188,7 +1188,8 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_CONFIG_UPDATE(P
 
 	_network_server_max_companies = p.Recv_uint8();
 	_network_server_name = p.Recv_string(NETWORK_NAME_LENGTH);
-	SetWindowClassesDirty(WC_CLIENT_LIST);
+
+	InvalidateWindowData(WC_CLIENT_LIST, 0);
 
 	Debug(net, 9, "Client::Receive_SERVER_CONFIG_UPDATE(): max_companies={}", _network_server_max_companies);
 
diff --git a/src/settings_table.cpp b/src/settings_table.cpp
index 0fd874a38c..9e06fe4e12 100644
--- a/src/settings_table.cpp
+++ b/src/settings_table.cpp
@@ -572,9 +572,10 @@ static void UpdateClientConfigValues()
 {
 	NetworkServerUpdateGameInfo();
 
+	InvalidateWindowData(WC_CLIENT_LIST, 0);
+
 	if (_network_server) {
 		NetworkServerSendConfigUpdate();
-		SetWindowClassesDirty(WC_CLIENT_LIST);
 	}
 }