diff --git a/backend/open_webui/routers/notes.py b/backend/open_webui/routers/notes.py
index b4555b2149..924e4c6f16 100644
--- a/backend/open_webui/routers/notes.py
+++ b/backend/open_webui/routers/notes.py
@@ -348,13 +348,9 @@ async def get_note_chat_by_id(
             changed = True
 
         system = (
-            f'CONTEXT:
-Current note id: {note.id}
-'
-            'This chat is attached to the current note.
-'
-            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.
-'
+            f'CONTEXT:\nCurrent note id: {note.id}\n'
+            'This chat is attached to the current note.\n'
+            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.\n'
             'Do not say an edit is done unless replace_note_content succeeds.'
         )
         if params.get('system') != system:
@@ -383,14 +379,10 @@ Current note id: {note.id}
                 'models': [''],
                 'params': {
                     'system': (
-                        f'CONTEXT:
-Current note id: {note.id}
-'
-            'This chat is attached to the current note.
-'
-            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.
-'
-            'Do not say an edit is done unless replace_note_content succeeds.'
+                        f'CONTEXT:\nCurrent note id: {note.id}\n'
+                        'This chat is attached to the current note.\n'
+                        'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.\n'
+                        'Do not say an edit is done unless replace_note_content succeeds.'
                     )
                 },
                 'history': {'messages': {}, 'currentId': None},
@@ -451,13 +443,9 @@ async def get_note_chats_by_id(
             changed = True
 
         system = (
-            f'CONTEXT:
-Current note id: {note.id}
-'
-            'This chat is attached to the current note.
-'
-            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.
-'
+            f'CONTEXT:\nCurrent note id: {note.id}\n'
+            'This chat is attached to the current note.\n'
+            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.\n'
             'Do not say an edit is done unless replace_note_content succeeds.'
         )
         if params.get('system') != system:
@@ -518,14 +506,10 @@ async def create_note_chat_by_id(
                 'models': [''],
                 'params': {
                     'system': (
-                        f'CONTEXT:
-Current note id: {note.id}
-'
-            'This chat is attached to the current note.
-'
-            'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.
-'
-            'Do not say an edit is done unless replace_note_content succeeds.'
+                        f'CONTEXT:\nCurrent note id: {note.id}\n'
+                        'This chat is attached to the current note.\n'
+                        'For edit requests like make this concise, rewrite, enhance, shorten, or update: call view_note then replace_note_content.\n'
+                        'Do not say an edit is done unless replace_note_content succeeds.'
                     )
                 },
                 'history': {'messages': {}, 'currentId': None},
diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 6a260953c3..fb74c9076f 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -2708,13 +2708,13 @@
 		}
 		history = history;
 
-			// Empty embedded drafts create their backing chat only when the first message is sent.
-			if (!_chatId) {
-				if (embedded && onCreateEmbeddedChat) {
-					const createdChat = await onCreateEmbeddedChat();
-					if (!createdChat?.id) {
-						toast.error($i18n.t('Failed to create chat'));
-						return;
+		// Empty embedded drafts create their backing chat only when the first message is sent.
+		if (!_chatId) {
+			if (embedded && onCreateEmbeddedChat) {
+				const createdChat = await onCreateEmbeddedChat();
+				if (!createdChat?.id) {
+					toast.error($i18n.t('Failed to create chat'));
+					return;
 				}
 
 				chat = createdChat;
@@ -2723,12 +2723,12 @@
 				await chatId.set(_chatId);
 				await chatTitle.set(createdChat?.chat?.title ?? createdChat?.title ?? $i18n.t('Chat'));
 
-					params = structuredClone(createdChat?.chat?.params ?? {});
-					delete params.note_id;
-					chatFiles = mergeFiles(chatFiles, createdChat?.chat?.files ?? []);
-					applyInitialFiles();
-					await onSelectEmbeddedChat?.(_chatId);
-				} else if ($temporaryChatEnabled) {
+				params = structuredClone(createdChat?.chat?.params ?? {});
+				delete params.note_id;
+				chatFiles = mergeFiles(chatFiles, createdChat?.chat?.files ?? []);
+				applyInitialFiles();
+				await onSelectEmbeddedChat?.(_chatId);
+			} else if ($temporaryChatEnabled) {
 				_chatId = `local:${$socket?.id}`;
 				await chatId.set(_chatId);
 			}