diff --git a/frontend/src/components/MermaidRenderer.tsx b/frontend/src/components/MermaidRenderer.tsx
index d3fda1d4..23b69155 100644
--- a/frontend/src/components/MermaidRenderer.tsx
+++ b/frontend/src/components/MermaidRenderer.tsx
@@ -32,7 +32,7 @@ const MermaidRenderer: React.FC<MermaidRendererProps> = ({
     const renderDiagram = async (): Promise<void> => {
       try {
         // Generate unique ID
-        const id = `mermaid-${Math.random().toString(36).substring(2, 9)}`;
+        const id = `mermaid-${crypto.randomUUID()}`;
 
         // Render the diagram
         const { svg } = await mermaid.render(id, code);