diff --git a/src/components/sidebar/PlayerListItem.vue b/src/components/sidebar/PlayerListItem.vue
index 8ddddf1..befacba 100644
--- a/src/components/sidebar/PlayerListItem.vue
+++ b/src/components/sidebar/PlayerListItem.vue
@@ -15,7 +15,7 @@
   -->
 
 <template>
-	<input :id="`player-${player.account}`" type="radio" name="player" v-bind:value="player" v-model="followTarget"
+	<input :id="`player-${player.account}`" type="radio" name="player" v-bind:value="player.account" v-model="followTarget"
 	       @click.prevent="onInputClick" />
 	<label :for="`player-${player.account}`"
 	       :class="{'player': true, 'player--hidden' : !!player.hidden, 'player--other-world': otherWorld}" :title="title"
@@ -58,7 +58,7 @@ export default defineComponent({
 				}
 			}),
 
-			followTarget = computed(() => store.state.followTarget),
+			followTarget = computed(() => store.state.followTarget ? store.state.followTarget.account : undefined),
 
 			pan = () => {
 				if(!props.player.hidden) {
diff --git a/src/components/sidebar/ServerListItem.vue b/src/components/sidebar/ServerListItem.vue
index ebf11bd..61f8f12 100644
--- a/src/components/sidebar/ServerListItem.vue
+++ b/src/components/sidebar/ServerListItem.vue
@@ -15,7 +15,7 @@
   -->
 
 <template>
-	<input :id="`server-${server.id}`" type="radio" name="server" v-bind:value="server" v-model="currentServer">
+	<input :id="`server-${server.id}`" type="radio" name="server" v-bind:value="server.id" v-model="currentServer">
 	<label :for="`server-${server.id}`">{{ server.label || server.id }}</label>
 </template>
 
@@ -37,10 +37,11 @@ export default defineComponent({
 	computed: {
 		currentServer: {
 			get() {
-				return useStore().state.currentServer;
+				const store = useStore();
+				return store.state.currentServer ? store.state.currentServer.id : undefined;
 			},
-			set(value) {
-				useStore().commit(MutationTypes.SET_CURRENT_SERVER, value.id);
+			set(value: string) {
+				useStore().commit(MutationTypes.SET_CURRENT_SERVER, value);
 			}
 		}
 	},
diff --git a/src/components/sidebar/WorldList.vue b/src/components/sidebar/WorldList.vue
index 14d42ed..573f38f 100644
--- a/src/components/sidebar/WorldList.vue
+++ b/src/components/sidebar/WorldList.vue
@@ -19,7 +19,7 @@
 		<template v-slot:heading>{{ heading }}</template>
 		<template v-slot:default>
 			<RadioList v-if="worlds.size" class="section__content" aria-labelledby="maps-heading">
-				<WorldListItem :world="world" v-for="[name, world] in worlds" :key="`${prefix}_${currentServer.id}_${name}`"></WorldListItem>
+				<WorldListItem :world="world" v-for="[name, world] in worlds" :key="`${prefix}_${currentServer}_${name}`"></WorldListItem>
 			</RadioList>
 			<div v-else class="section__skeleton">{{ skeletonWorlds }}</div>
 		</template>
@@ -41,6 +41,13 @@ export default defineComponent({
 		WorldListItem
 	},
 
+	props: {
+		prefix: {
+			type: String,
+			default: 'map',
+		}
+	},
+
 	computed: {
 		heading() {
 			return useStore().state.messages.worldsHeading;
@@ -55,7 +62,8 @@ export default defineComponent({
 		},
 
 		currentServer() {
-			return useStore().state.currentServer;
+			const store = useStore();
+			return store.state.currentServer ? store.state.currentServer.id : undefined;
 		}
 	}
 });
diff --git a/src/components/sidebar/WorldListItem.vue b/src/components/sidebar/WorldListItem.vue
index 5ebeeab..b7cfaaa 100644
--- a/src/components/sidebar/WorldListItem.vue
+++ b/src/components/sidebar/WorldListItem.vue
@@ -19,7 +19,9 @@
 		<span class="world__name" aria-hidden="true">{{ world.title }}</span>
 		<div class="world__maps menu">
 			<template v-for="[key, map] in world.maps" :key="`${world.name}_${key}`">
-				<input :id="`${name}-${world.name}-${key}`" type="radio" :name="name" v-bind:value="map" v-model="currentMap" :aria-labelledby="`${name}-${world.name}-${key}-label`">
+				<input :id="`${name}-${world.name}-${key}`" type="radio" :name="name"
+				       v-bind:value="[world.name,map.name]" v-model="currentMap"
+				       :aria-labelledby="`${name}-${world.name}-${key}-label`">
 				<label :id="`${name}-${world.name}-${key}-label`" class="map" :for="`${name}-${world.name}-${key}`" :title="`${world.title} - ${map.title}`">
 					<SvgIcon :name="getMapIcon(map)"></SvgIcon>
 				</label>
@@ -63,10 +65,11 @@ export default defineComponent({
 	computed: {
 		currentMap: {
 			get() {
-				return useStore().state.currentMap;
+				const store = useStore();
+				return store.state.currentMap ? `${store.state.currentMap.world.name}_${store.state.currentMap.name}` : undefined;
 			},
-			set(value) {
-				useStore().commit(MutationTypes.SET_CURRENT_MAP, {worldName: this.world.name, mapName: value.name});
+			set(value: string[]) {
+				useStore().commit(MutationTypes.SET_CURRENT_MAP, {worldName: value[0], mapName: value[1]});
 			}
 		}
 	},