diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index 478b12085a..2a399a5793 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -540,6 +540,8 @@ namespace OpenRA.Server
 
 				if (conns.Count != 0 || lobbyInfo.GlobalSettings.Dedicated)
 					SyncLobbyInfo();
+				if ( !lobbyInfo.GlobalSettings.Dedicated && dropClient.IsAdmin )
+					Shutdown();
 			}
 
 			try