diff --git a/src/components/World.vue b/src/components/World.vue
index dced32c..03a2b4c 100644
--- a/src/components/World.vue
+++ b/src/components/World.vue
@@ -95,13 +95,13 @@ onBeforeMount(() => {
   exampleTilesArray.forEach((row, y) => row.forEach((tile, x) => placeTile(zoneTilemap, tiles, x, y, 'blank_tile')))
   zoneTiles = exampleTilesArray
 
-  if (zoneStore.zone && zoneStore.zone.tiles) {
-    setAllTiles(zoneTilemap, tiles, zoneStore.zone.tiles)
-    zoneTiles = zoneStore.zone.tiles
+  if (gameStore.character?.zone ?? gameStore.character?.zone?.tiles) {
+    setAllTiles(zoneTilemap, tiles, gameStore.character?.zone?.tiles ?? [])
+    zoneTiles = gameStore.character?.zone?.tiles ?? []
 
     // Determine the current zone dimensions
-    const currentZoneWidth = zoneStore.zone.width ?? 0
-    const currentZoneHeight = zoneStore.zone.height ?? 0
+    const currentZoneWidth = gameStore.character?.zone?.width ?? 0
+    const currentZoneHeight = gameStore.character?.zone?.height ?? 0
 
     // Ensure zoneTiles matches the current zone dimensions, filling new spaces with 'blank_tile'
     for (let y = 0; y < currentZoneHeight; y++) {