diff --git a/packages/components/src/utils.ts b/packages/components/src/utils.ts
index f3b8edbec6f..ab84836f46a 100644
--- a/packages/components/src/utils.ts
+++ b/packages/components/src/utils.ts
@@ -616,7 +616,7 @@ export const mapChatMessageToBaseMessage = async (chatmessages: any[] = []): Pro
                     const uploads = JSON.parse(message.fileUploads)
                     const imageContents: MessageContentImageUrl[] = []
                     for (const upload of uploads) {
-                        if (upload.type === 'stored-file') {
+                        if (upload.type === 'stored-file' && upload.mime.startsWith('image')) {
                             const fileData = await getFileFromStorage(upload.name, message.chatflowid, message.chatId)
                             // as the image is stored in the server, read the file and convert it to base64
                             const bf = 'data:' + upload.mime + ';base64,' + fileData.toString('base64')
@@ -627,7 +627,7 @@ export const mapChatMessageToBaseMessage = async (chatmessages: any[] = []): Pro
                                     url: bf
                                 }
                             })
-                        } else if (upload.type === 'url') {
+                        } else if (upload.type === 'url' && upload.mime.startsWith('image')) {
                             imageContents.push({
                                 type: 'image_url',
                                 image_url: {
diff --git a/packages/ui/src/ui-component/dialog/ViewMessagesDialog.jsx b/packages/ui/src/ui-component/dialog/ViewMessagesDialog.jsx
index d910787e453..ef981cd9285 100644
--- a/packages/ui/src/ui-component/dialog/ViewMessagesDialog.jsx
+++ b/packages/ui/src/ui-component/dialog/ViewMessagesDialog.jsx
@@ -203,7 +203,7 @@ const ViewMessagesDialog = ({ show, dialogProps, onCancel }) => {
             }
             if (filePaths.length) msg.filePaths = filePaths
             if (chatmsg.sourceDocuments) msg.sourceDocuments = chatmsg.sourceDocuments
-            if (chatmsg.usedTools) msg.usedTools = Jchatmsg.usedTools
+            if (chatmsg.usedTools) msg.usedTools = chatmsg.usedTools
             if (chatmsg.fileAnnotations) msg.fileAnnotations = chatmsg.fileAnnotations
             if (chatmsg.feedback) msg.feedback = chatmsg.feedback?.content
             if (chatmsg.agentReasoning) msg.agentReasoning = chatmsg.agentReasoning