diff --git a/src/components/utilities/assetManager/partials/TileList.vue b/src/components/utilities/assetManager/partials/TileList.vue
index dbef42f..d94e21f 100644
--- a/src/components/utilities/assetManager/partials/TileList.vue
+++ b/src/components/utilities/assetManager/partials/TileList.vue
@@ -36,7 +36,7 @@ const searchQuery = ref('')
 const handleFileUpload = (e: Event) => {
   const files = (e.target as HTMLInputElement).files
   if (!files) return
-  gameStore.connection.emit('gm:tile:upload', files, (response: boolean) => {
+  gameStore.connection?.emit('gm:tile:upload', files, (response: boolean) => {
     if (!response) {
       if (config.development) console.error('Failed to upload tile')
       return
@@ -44,7 +44,7 @@ const handleFileUpload = (e: Event) => {
 
     assetStore.fetchAssets()
 
-    gameStore.connection.emit('gm:tile:list', {}, (response: Tile[]) => {
+    gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
       assetManagerStore.setTileList(response)
     })
   })
@@ -63,7 +63,7 @@ const filteredTiles = computed(() => {
 })
 
 onMounted(() => {
-  gameStore.connection.emit('gm:tile:list', {}, (response: Tile[]) => {
+  gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
     assetManagerStore.setTileList(response)
   })
 })
diff --git a/src/components/utilities/zoneEditor/Tiles.vue b/src/components/utilities/zoneEditor/Tiles.vue
index 4a30c22..dbf7770 100644
--- a/src/components/utilities/zoneEditor/Tiles.vue
+++ b/src/components/utilities/zoneEditor/Tiles.vue
@@ -83,7 +83,7 @@ const toggleTag = (tag: string) => {
 
 onMounted(async () => {
   isModalOpen.value = true
-  gameStore.connection.emit('gm:tile:list', {}, (response: Tile[]) => {
+  gameStore.connection?.emit('gm:tile:list', {}, (response: Tile[]) => {
     zoneEditorStore.setTileList(response)
   })
 })