diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 9787be7d27..698af005db 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -1368,8 +1368,8 @@
 			socket?.emit('events:chat', { chat_id: joinedChatId, data: { type: 'leave' } });
 		joinedChatId = next;
 		if (next)
-			socket?.emit('events:chat', { chat_id: next, data: { type: 'join' } }, (joined: boolean) => {
-				if (joined && $chatId === next) void refreshChat();
+			socket?.emit('events:chat', { chat_id: next, data: { type: 'join' } }, () => {
+				if ($chatId === next) void refreshChat();
 			});
 	};
 	$: syncChatRoom($socket, $chatId, $temporaryChatEnabled);
diff --git a/src/routes/s/[id]/+page.svelte b/src/routes/s/[id]/+page.svelte
index 645002b261..f2385ce975 100644
--- a/src/routes/s/[id]/+page.svelte
+++ b/src/routes/s/[id]/+page.svelte
@@ -109,7 +109,7 @@
 
 		if (chat?.chat?.share_mode === 'continue' && chat.id !== shareId) {
 			await goto(`/c/${chat.id}`, { replaceState: true });
-			return;
+			return true;
 		}
 
 		if (chat) {