diff --git a/src/renderer/src/context/SyntaxHighlighterProvider.tsx b/src/renderer/src/context/SyntaxHighlighterProvider.tsx
index 650146f725..c8e747aae9 100644
--- a/src/renderer/src/context/SyntaxHighlighterProvider.tsx
+++ b/src/renderer/src/context/SyntaxHighlighterProvider.tsx
@@ -49,7 +49,7 @@ export const SyntaxHighlighterProvider: React.FC<PropsWithChildren> = ({ childre
     }
 
     initHighlighter()
-  }, [highlighterTheme, theme])
+  }, [highlighterTheme])
 
   const codeToHtml = async (code: string, language: string) => {
     if (!highlighter) return ''
diff --git a/src/renderer/src/hooks/useMermaid.ts b/src/renderer/src/hooks/useMermaid.ts
index c4ac40dba5..c0ecc1a09b 100644
--- a/src/renderer/src/hooks/useMermaid.ts
+++ b/src/renderer/src/hooks/useMermaid.ts
@@ -23,13 +23,15 @@ export const useMermaid = () => {
   }, [])
 
   useEffect(() => {
-    if (window.mermaid) {
-      window.mermaid.initialize({
-        startOnLoad: true,
-        theme: theme === ThemeMode.dark ? 'dark' : 'default'
-      })
-      window.mermaid.contentLoaded()
-    }
+    setTimeout(() => {
+      if (window.mermaid) {
+        window.mermaid.initialize({
+          startOnLoad: true,
+          theme: theme === ThemeMode.dark ? 'dark' : 'default'
+        })
+        window.mermaid.contentLoaded()
+      }
+    }, 2000)
   }, [theme])
 
   useEffect(() => {