diff --git a/mito-ai/src/Extensions/AiChat/ChatMessage/ChatMessage.tsx b/mito-ai/src/Extensions/AiChat/ChatMessage/ChatMessage.tsx
index e712dc7a2..1c0a97e44 100644
--- a/mito-ai/src/Extensions/AiChat/ChatMessage/ChatMessage.tsx
+++ b/mito-ai/src/Extensions/AiChat/ChatMessage/ChatMessage.tsx
@@ -114,7 +114,7 @@ const ChatMessage: React.FC<IChatMessageProps> = ({
                 } else {
                     return (
                         <div style={{ position: 'relative' }}>
-                            <p key={index} onDoubleClick={() => setIsEditing(true)}>
+                            <p key={index + messagePart} onDoubleClick={() => setIsEditing(true)}>
                                 {mitoAIConnectionError && <span style={{ marginRight: '4px' }}><ErrorIcon /></span>}
                                 <MarkdownBlock
                                     markdown={messagePart}
diff --git a/mito-ai/src/Extensions/AiChat/ChatMessage/MarkdownBlock.tsx b/mito-ai/src/Extensions/AiChat/ChatMessage/MarkdownBlock.tsx
index 3166ba461..7c00ab3dc 100644
--- a/mito-ai/src/Extensions/AiChat/ChatMessage/MarkdownBlock.tsx
+++ b/mito-ai/src/Extensions/AiChat/ChatMessage/MarkdownBlock.tsx
@@ -28,7 +28,7 @@ const MarkdownBlock: React.FC<IMarkdownCodeProps> = ({ markdown, rendermime }) =
     }, [markdown, rendermime]);
 
     return (
-        <div>{renderedContent || <div>No content</div>} </div>
+        <div>{renderedContent || <div></div>} </div>
     );
 };