diff --git a/src/lib/components/channel/MessageInput.svelte b/src/lib/components/channel/MessageInput.svelte
index 65cc77449b..df2772645b 100644
--- a/src/lib/components/channel/MessageInput.svelte
+++ b/src/lib/components/channel/MessageInput.svelte
@@ -290,11 +290,12 @@
 
 		content = '';
 		files = [];
-		chatInputElement?.setText('');
-
-		await tick();
 
 		if (chatInputElement) {
+			chatInputElement?.setText('');
+
+			await tick();
+
 			chatInputElement.focus();
 		}
 	};