diff --git a/backend/open_webui/routers/notes.py b/backend/open_webui/routers/notes.py
index 924e4c6f16..841526d6b9 100644
--- a/backend/open_webui/routers/notes.py
+++ b/backend/open_webui/routers/notes.py
@@ -579,9 +579,17 @@ async def update_note_by_id(
         pinned_note_ids = await Notes.get_pinned_note_ids(user.id, db=db)
         note.is_pinned = note.id in pinned_note_ids
 
+        event_data = note.model_dump()
+        if form_data.data is not None:
+            event_data['data'] = {
+                key: note.data.get(key)
+                for key in form_data.data.keys()
+                if note.data is not None and key in note.data
+            }
+
         await sio.emit(
             'events:note',
-            note.model_dump(),
+            event_data,
             to=f'note:{note.id}',
         )
 
diff --git a/src/lib/components/common/RichTextInput/Image/image.ts b/src/lib/components/common/RichTextInput/Image/image.ts
index 08e27fc088..cfd0fd8d98 100644
--- a/src/lib/components/common/RichTextInput/Image/image.ts
+++ b/src/lib/components/common/RichTextInput/Image/image.ts
@@ -150,9 +150,9 @@ export const Image = Node.create<ImageOptions>({
 			img.setAttribute('title', node.attrs.title || '');
 
 			img.addEventListener('data', (e) => {
-				const files = e?.files || [];
+				const files = e?.files || editor.storage?.files || [];
 				if (files && node.attrs.src.startsWith('data://')) {
-					const file = editorFiles.find((f) => f.id === fileId);
+					const file = files.find((f) => f.id === fileId);
 					if (file) {
 						img.setAttribute('src', safeImageUrl(file.url || ''));
 					} else {