diff --git a/OpenRA.Game/Server/MasterServerQuery.cs b/OpenRA.Game/Server/MasterServerQuery.cs
index 4b09e4cd27..d15a7171ad 100644
--- a/OpenRA.Game/Server/MasterServerQuery.cs
+++ b/OpenRA.Game/Server/MasterServerQuery.cs
@@ -16,7 +16,8 @@ namespace OpenRA.Server
 			var str = Encoding.UTF8.GetString(data);
 
 			var yaml = MiniYaml.FromString(str);
-			return yaml.Select(a => { var gs = new GameServer(); FieldLoader.Load(gs, a.Value); return gs; });
+			return yaml.Select(a => { var gs = new GameServer(); FieldLoader.Load(gs, a.Value); return gs; })
+				.Where(gs => gs.Address != null);
 		}
 	}