diff --git a/src/components/Header/ServerListComponent.vue b/src/components/Header/ServerListComponent.vue
index 196a40f..3621b07 100644
--- a/src/components/Header/ServerListComponent.vue
+++ b/src/components/Header/ServerListComponent.vue
@@ -9,6 +9,8 @@
           active-color="primary"
           :to="getToUrl(guild)"
           :disabled="shouldBeDisabled(guild)"
+          :data-guild-id="guild.id"
+          @click="clickOnGuild(guild.id)"
         >
           <v-list-item-avatar
             start
@@ -75,6 +77,10 @@ function getToUrl(guild: Guild): RouteLocationRaw {
     },
   };
 }
+
+function clickOnGuild(guildId: string) {
+  mutualGuildsStore.lastGuildId = guildId;
+}
 </script>
 
 <style scoped></style>
diff --git a/src/views/GuildHomeView.vue b/src/views/GuildHomeView.vue
index 6308396..482a903 100644
--- a/src/views/GuildHomeView.vue
+++ b/src/views/GuildHomeView.vue
@@ -24,14 +24,14 @@
 </template>
 
 <script setup lang="ts">
+import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue";
 import { useMutualGuildsStore } from "@/stores/mutualGuilds";
 import { redirectIfNoGuild } from "@/tools/GuildTools";
-import { ref, watch } from "vue";
+import { ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import AudioPreviewComponent from "../components/guild/home/AudioPreviewComponent.vue";
 import SettingPreviewComponent from "../components/guild/home/SettingPreviewComponent.vue";
 import StatsPreviewComponent from "../components/guild/home/StatsPreviewComponent.vue";
-import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue";
 
 const guildStore = useMutualGuildsStore();
 const route = useRoute();
@@ -39,15 +39,6 @@ const router = useRouter();
 
 const guild = ref(guildStore.getGuild(route.params.guildId as string));
 redirectIfNoGuild(guild.value, router);
-
-watch(
-  () => route.params.guildId,
-  (value, oldValue) => {
-    guild.value = guildStore.getGuild(value as string);
-    guildStore.lastGuildId = guild.value?.id;
-    redirectIfNoGuild(guild.value, router);
-  }
-);
 </script>
 
 <style scoped></style>
diff --git a/src/views/GuildSettingView.vue b/src/views/GuildSettingView.vue
index 6d15933..7eca068 100644
--- a/src/views/GuildSettingView.vue
+++ b/src/views/GuildSettingView.vue
@@ -10,27 +10,19 @@
 </template>
 
 <script setup lang="ts">
+import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue";
 import { useMutualGuildsStore } from "@/stores/mutualGuilds";
 import { redirectIfNoGuild } from "@/tools/GuildTools";
-import { ref, watch } from "vue";
+import { ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import SettingListComponent from "../components/guild/Settings/SettingListComponent.vue";
-import GuildHeaderComponent from "@/components/guild/GuildHeaderComponent.vue";
+
 const guildStore = useMutualGuildsStore();
 const route = useRoute();
 const router = useRouter();
 
 const guild = ref(guildStore.getGuild(route.params.guildId as string));
 redirectIfNoGuild(guild.value, router);
-
-watch(
-  () => route.params.guildId,
-  (value, oldValue) => {
-    guild.value = guildStore.getGuild(value as string);
-    guildStore.lastGuildId = guild.value?.id;
-    redirectIfNoGuild(guild.value, router);
-  }
-);
 </script>
 
 <style scoped></style>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index f86f458..043cbf9 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -15,11 +15,12 @@ import { useMutualGuildsStore } from "@/stores/mutualGuilds";
 import { useUserStore } from "@/stores/user";
 import { onBeforeMount } from "vue";
 import { useRouter } from "vue-router";
+
 const userStore = useUserStore();
-const mutualGuildStore = useMutualGuildsStore();
 const router = useRouter();
 
 onBeforeMount(() => {
+  const mutualGuildStore = useMutualGuildsStore();
   if (userStore.isLoggedIn) {
     if (!mutualGuildStore.lastGuildId) {
       mutualGuildStore.lastGuildId = mutualGuildStore.guilds[0]?.id;