diff --git a/src/routes/graphs/+layout.ts b/src/routes/graphs/+layout.ts
index 9bb8bcf..0541d0b 100644
--- a/src/routes/graphs/+layout.ts
+++ b/src/routes/graphs/+layout.ts
@@ -44,7 +44,7 @@ export const load: LayoutLoad = async ({ fetch }) => {
 
       if (typeof gameGroupSelections[gameSelection] === 'undefined') {
         // Default to all available groups
-        gameGroupSelections[gameSelection] = { gameId: gameSelection, selectedGroups: Object.fromEntries(Object.values(Object.values(chellarisData.games)[gameSelection].groups).map((group) => group.id).entries()) };
+        gameGroupSelections[gameSelection] = { gameId: gameSelection, selectedGroups: Object.fromEntries(Object.values(chellarisData.games[gameSelection].groups).map((group) => group.id).entries()) };
 
         // Set Local Storage to default Values if not previously defined
         localStorage.setItem('gameGroupSelection', JSON.stringify(gameGroupSelections));
@@ -73,7 +73,7 @@ export const load: LayoutLoad = async ({ fetch }) => {
 
   if (typeof gameGroupSelections[gameSelection] === 'undefined') {
     // Default to all available groups
-    gameGroupSelections[gameSelection] = { gameId: gameSelection, selectedGroups: Object.fromEntries(Object.values(Object.values(chellarisData.games)[gameSelection].groups).map((group) => group.id).entries()) };
+    gameGroupSelections[gameSelection] = { gameId: gameSelection, selectedGroups: Object.fromEntries(Object.values(chellarisData.games[gameSelection].groups).map((group) => group.id).entries()) };
   }
 
   SelectedGameGroupsStore.set(gameGroupSelections);