diff --git a/frontend/src/pages/server/channel/index.vue b/frontend/src/pages/server/channel/index.vue
index f76ce86..1dd1d78 100644
--- a/frontend/src/pages/server/channel/index.vue
+++ b/frontend/src/pages/server/channel/index.vue
@@ -1,9 +1,16 @@
 <script lang="ts" setup>
-import {computed, onMounted, ref} from 'vue';
+import {computed, onMounted, ref, watch} from 'vue';
 import {useRoute} from 'vue-router';
 import {storeToRefs} from 'pinia'; // Import crucial
 import {useMessageStore} from '@/stores/message';
 
+const props = defineProps<{
+  serverId: string
+  channelId: string
+}>();
+
+const channelId = computed(() => props.channelId);
+
 const route = useRoute();
 const messageStore = useMessageStore();
 
@@ -11,7 +18,7 @@ const messageStore = useMessageStore();
 const {messages, loading} = storeToRefs(messageStore);
 
 const newMessage = ref('');
-const channelId = computed(() => route.params.channelId as string);
+
 
 const sendMessage = async () => {
   if (!newMessage.value.trim()) return;
@@ -31,6 +38,11 @@ onMounted(() => {
     messageStore.fetchMessages(channelId.value);
   }
 });
+watch(channelId, (newChannelId) => {
+  if (newChannelId) {
+    messageStore.fetchMessages(newChannelId);
+  }
+}, {immediate: true})
 </script>
 
 <template>
diff --git a/frontend/src/pages/server/index.vue b/frontend/src/pages/server/index.vue
index 06030d3..492fb87 100644
--- a/frontend/src/pages/server/index.vue
+++ b/frontend/src/pages/server/index.vue
@@ -1,12 +1,16 @@
 <script lang="ts" setup>
 import {storeToRefs} from 'pinia'
 import {useChannelStore} from '@/stores/channel'
-import {computed, ref} from 'vue'
+import {ref} from 'vue'
 import {useRoute} from 'vue-router'
 
-const route = useRoute()
-const serverId = computed(() => route.params.serverId as string)
+const props = defineProps<{
+  serverId: string
+  channelId?: string
+}>();
+const serverId = props.serverId
 
+const route = useRoute()
 const channelStore = useChannelStore()
 const {channels} = storeToRefs(channelStore)
 
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 7055580..0a25a82 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -80,7 +80,7 @@ const router = createRouter({
   ],
 })
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to) => {
   const sessionStore = useSessionStore()
   const authStore = useAuthStore()
   if (!sessionStore.isReady) {
@@ -93,16 +93,16 @@ router.beforeEach(async (to, from, next) => {
 
   if (authRequired && !authStore.isAuthenticated) {
     // Non connecté -> Login
-    next('/auth/login')
+    return '/auth/login'
   } else if (to.name === 'login' && authStore.isAuthenticated) {
     // Déjà connecté -> Accueil
-    next('/')
+    return '/'
   } else if (adminRequired && !authStore.isAdmin) {
     // Connecté mais pas admin -> Accueil (ou page 403)
-    next('/')
-  } else {
-    next()
+    return '/'
   }
+  // Retourner true ou ne rien retourner permet de continuer la navigation
+  return true
 })
 
 export default router
diff --git a/frontend/src/stores/gateway.ts b/frontend/src/stores/gateway.ts
index ec93eec..d413437 100644
--- a/frontend/src/stores/gateway.ts
+++ b/frontend/src/stores/gateway.ts
@@ -81,6 +81,7 @@ export const useGatewayStore = defineStore('gateway', {
     },
 
     async handleMessage(rawData: string) {
+      console.log("[ws]message received", rawData)
     },
 
     async scheduleReconnect() {