diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
index 450dfaef98..82b7fe8a65 100644
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -295,10 +295,7 @@ namespace OpenRA.Network
 						{
 							var strings = node.Key.Split('@');
 							if (strings[0] == "GlobalSettings")
-							{
 								orderManager.LobbyInfo.GlobalSettings = Session.Global.Deserialize(node.Value);
-								orderManager.IssueOrder(Order.Command("state {0}".F(Session.ClientState.NotReady)));
-							}
 						}
 
 						SetOrderLag(orderManager);
diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
index c26df4882b..b9575a3906 100644
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -523,6 +523,11 @@ namespace OpenRA.Mods.Common.Server
 			server.SyncLobbyGlobalSettings();
 			server.SendMessage(option.ValueChangedMessage(client.Name, split[1]));
 
+			foreach (var c in server.LobbyInfo.Clients)
+				c.State = Session.ClientState.NotReady;
+
+			server.SyncLobbyClients();
+
 			return true;
 		}