diff --git a/WebfrontCore/ViewComponents/ServerListViewComponent.cs b/WebfrontCore/ViewComponents/ServerListViewComponent.cs
index 580414c37..b4f662a2d 100644
--- a/WebfrontCore/ViewComponents/ServerListViewComponent.cs
+++ b/WebfrontCore/ViewComponents/ServerListViewComponent.cs
@@ -33,7 +33,8 @@ namespace WebfrontCore.ViewComponents
         {
             if (game.HasValue)
             {
-                ViewBag.Maps = _defaultSettings.Maps.FirstOrDefault(map => map.Game == game);
+                ViewBag.Maps = _defaultSettings.Maps.FirstOrDefault(map => map.Game == game)?.Maps.ToList() ??
+                               new List<Map>();
             }
             else
             {