diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
index 4d961335c0..befeb4359c 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
@@ -46,7 +46,6 @@
 	let mobileScrollDownHint = $state(false);
 	let mobileScrollDownHintLockedUntil = $state(0);
 	let emptyFileNames = $state<string[]>([]);
-	let initialMessage = $state('');
 	let showDeleteDialog = $state(false);
 	let showEmptyFileDialog = $state(false);
 	let isEmpty = $derived(
@@ -385,7 +384,6 @@
 				bind:uploadedFiles={fileUpload.uploadedFiles}
 				class="pointer-events-auto conversation-chat-form"
 				disabled={hasPropsError || chatStore.isEditing()}
-				{initialMessage}
 				isLoading={isCurrentConversationLoading}
 				onFileRemove={fileUpload.handleFileRemove}
 				onFileUpload={fileUpload.handleFileUpload}
diff --git a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
index 121d9f9ab6..d1438434b2 100644
--- a/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
+++ b/tools/ui/src/lib/components/app/chat/ChatScreen/ChatScreenForm.svelte
@@ -9,7 +9,6 @@
 	interface Props {
 		class?: string;
 		disabled?: boolean;
-		initialMessage?: string;
 		isLoading?: boolean;
 		onFileRemove?: (fileId: string) => void;
 		onFileUpload?: (files: File[]) => void;
@@ -22,7 +21,6 @@
 	let {
 		class: className,
 		disabled = false,
-		initialMessage = '',
 		isLoading = false,
 		onFileRemove,
 		onFileUpload,
@@ -62,14 +60,12 @@
 		};
 	});
 	let hasLoadingAttachments = $derived(uploadedFiles.some((f) => f.isLoading));
-	let message = $derived(initialMessage);
+	let message = $state('');
 	let previousIsLoading = $derived(isLoading);
-	let previousInitialMessage = $derived(initialMessage);
 
 	const { clearDraft } = useDraftMessages({
 		getChatId: () => chatId,
 		getFiles: () => uploadedFiles,
-		getInitialMessage: () => initialMessage,
 		getMessage: () => message,
 		setFiles: (f) => (uploadedFiles = f),
 		setMessage: (m) => (message = m)
@@ -132,13 +128,6 @@
 		}
 	});
 
-	$effect(() => {
-		if (initialMessage !== previousInitialMessage) {
-			message = initialMessage;
-			previousInitialMessage = initialMessage;
-		}
-	});
-
 	$effect(() => {
 		if (previousIsLoading && !isLoading) {
 			setTimeout(focusFormUnlessCaptured, 10);
diff --git a/tools/ui/src/lib/hooks/use-draft-messages.svelte.ts b/tools/ui/src/lib/hooks/use-draft-messages.svelte.ts
index 5670177477..3f49fc92fb 100644
--- a/tools/ui/src/lib/hooks/use-draft-messages.svelte.ts
+++ b/tools/ui/src/lib/hooks/use-draft-messages.svelte.ts
@@ -8,7 +8,6 @@ interface UseDraftMessagesOptions {
 	getFiles: () => ChatUploadedFile[];
 	setMessage: (message: string) => void;
 	setFiles: (files: ChatUploadedFile[]) => void;
-	getInitialMessage: () => string;
 }
 
 export function useDraftMessages(options: UseDraftMessagesOptions) {
@@ -16,7 +15,7 @@ export function useDraftMessages(options: UseDraftMessagesOptions) {
 		const chatId = options.getChatId();
 		const draft = draftMessagesStore.getDraftMessage(chatId);
 
-		if ((draft.message || draft.files.length > 0) && !options.getInitialMessage()) {
+		if (draft.message || draft.files.length > 0) {
 			options.setMessage(draft.message);
 			options.setFiles(draft.files);
 		}