diff --git a/assets/js/mermaid.js b/assets/js/mermaid.js
index 821e567872..9580739917 100644
--- a/assets/js/mermaid.js
+++ b/assets/js/mermaid.js
@@ -2,10 +2,9 @@
 {{ if .enable }}
 (function($) {
     var needMermaid = false;
-    $('.language-mermaid').parent().replaceWith(function() {
+    if ($('.mermaid').length > 0) {
         needMermaid = true;
-        return $('<pre class="mermaid">').text($(this).text());
-    });
+    };
 
     if (!needMermaid)  {
         mermaid.initialize({startOnLoad: false});
diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html b/layouts/_default/_markup/render-codeblock-mermaid.html
new file mode 100644
index 0000000000..85166b1de9
--- /dev/null
+++ b/layouts/_default/_markup/render-codeblock-mermaid.html
@@ -0,0 +1,3 @@
+<div class="mermaid">
+  {{- .Inner | safeHTML }}
+</div>