diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html b/layouts/_default/_markup/render-codeblock-mermaid.html
index 314d679..b0f80f2 100644
--- a/layouts/_default/_markup/render-codeblock-mermaid.html
+++ b/layouts/_default/_markup/render-codeblock-mermaid.html
@@ -1,4 +1,4 @@
 <pre class="mermaid hx-mt-6">
-  {{- .Inner | safeHTML -}}
+  {{ .Inner | htmlEscape | safeHTML }}
 </pre>
 {{- .Page.Store.Set "hasMermaid" true -}}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 0bc62dc..bd8543c 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -5,8 +5,7 @@
 {{- partial "scripts/search.html" . -}}
 
 {{/* Mermaid */}}
-{{/* FIXME: need to investigate .Page.Store hasMermaid is set for homepage */}}
-{{- if and (.Page.Store.Get "hasMermaid") (not .Page.IsHome) -}}
+{{- if (.Store.Get "hasMermaid") -}}
   {{- partial "scripts/mermaid.html" . -}}
 {{- end -}}