diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 26417944f70..62334cb598e 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -31,10 +31,7 @@
 	const publicConfig = data.publicConfig;
 	const client = useAPIClient();
 
-	let conversations = $state(data.conversations);
-	$effect(() => {
-		data.conversations && untrack(() => (conversations = data.conversations));
-	});
+	let conversations = $derived(data.conversations);
 
 	let isNavCollapsed = $state(false);
 
diff --git a/src/routes/conversation/[id]/+page.svelte b/src/routes/conversation/[id]/+page.svelte
index 825a53ca9dd..589992e4aac 100644
--- a/src/routes/conversation/[id]/+page.svelte
+++ b/src/routes/conversation/[id]/+page.svelte
@@ -38,10 +38,7 @@
 
 	let files: File[] = $state([]);
 
-	let conversations = $state(data.conversations);
-	$effect(() => {
-		conversations = data.conversations;
-	});
+	let conversations = $derived(data.conversations);
 
 	function createMessagesPath<T>(messages: TreeNode<T>[], msgId?: TreeId): TreeNode<T>[] {
 		if (initialRun) {