diff --git a/src/lib/components/channel/Channel.svelte b/src/lib/components/channel/Channel.svelte
index 9111c4af5..c1731725b 100644
--- a/src/lib/components/channel/Channel.svelte
+++ b/src/lib/components/channel/Channel.svelte
@@ -42,6 +42,10 @@
 		top = false;
 		messages = null;
 		channel = null;
+		threadId = null;
+
+		typingUsers = [];
+		typingUsersTimeout = {};
 
 		channel = await getChannelById(localStorage.token, id).catch((error) => {
 			return null;
diff --git a/src/lib/components/channel/Messages/Message.svelte b/src/lib/components/channel/Messages/Message.svelte
index e5ebff221..d9f8389ec 100644
--- a/src/lib/components/channel/Messages/Message.svelte
+++ b/src/lib/components/channel/Messages/Message.svelte
@@ -32,6 +32,7 @@
 
 	export let message;
 	export let showUserProfile = true;
+	export let thread = false;
 
 	export let onDelete: Function = () => {};
 	export let onEdit: Function = () => {};
@@ -101,7 +102,7 @@
 						</Tooltip>
 					</ReactionPicker>
 
-					{#if message?.parent_id === null}
+					{#if !thread}
 						<Tooltip content={$i18n.t('Reply in Thread')}>
 							<button
 								class="hover:bg-gray-100 dark:hover:bg-gray-800 transition rounded-lg p-1"
diff --git a/src/lib/components/channel/Messages/Thread.svelte b/src/lib/components/channel/Messages/Thread.svelte
index cec092e66..21254a776 100644
--- a/src/lib/components/channel/Messages/Thread.svelte
+++ b/src/lib/components/channel/Messages/Thread.svelte
@@ -7,7 +7,7 @@
 	export let onClose = () => {};
 </script>
 
-<div class="flex flex-col w-full h-full bg-gray-50 dark:bg-gray-900 px-3.5 py-3">
+<div class="flex flex-col w-full h-full bg-gray-50 dark:bg-gray-850 px-3.5 py-3">
 	<div class="flex items-center justify-between">
 		<div class=" font-medium text-lg">Thread</div>