diff --git a/src/apps/chat/components/message/ChatMessage.tsx b/src/apps/chat/components/message/ChatMessage.tsx
index d79b1e63f..5bf55e6e2 100644
--- a/src/apps/chat/components/message/ChatMessage.tsx
+++ b/src/apps/chat/components/message/ChatMessage.tsx
@@ -492,7 +492,7 @@ export function ChatMessage(props: {
 
           {/* sequence of render components, for each Block */}
           {!errorMessage && parseBlocks(collapsedText, fromSystem, textDiffs)
-            .filter(block => !props.diagramMode || block.type === 'code')
+            .filter((block, _, blocks) => !props.diagramMode || block.type === 'code' || blocks.length === 1)
             .map(
               (block, index) =>
                 block.type === 'html'