diff --git a/src/lib/components/channel/Thread.svelte b/src/lib/components/channel/Thread.svelte
index 270e87a17f..9ac74ce8a7 100644
--- a/src/lib/components/channel/Thread.svelte
+++ b/src/lib/components/channel/Thread.svelte
@@ -35,7 +35,11 @@
 	let typingUsersTimeout = {};
 
 	$: if (threadId) {
-		initHandler($page.url.searchParams.get('message') ?? '');
+		initHandler(
+			$page.url.searchParams.get('thread') === threadId
+				? ($page.url.searchParams.get('message') ?? '')
+				: ''
+		);
 	}
 
 	const scrollToBottom = () => {