diff --git a/layouts/partials/shortcodes/mermaid.html b/layouts/partials/shortcodes/mermaid.html
index 01a70ba588..6bdfb96272 100644
--- a/layouts/partials/shortcodes/mermaid.html
+++ b/layouts/partials/shortcodes/mermaid.html
@@ -42,6 +42,6 @@
     {{- if $v }}
       {{- printf " %s=%q" $k $v | safeHTMLAttr }}
     {{- end }}
-  {{- end }}>{{ replaceRE "&#39;" "'" ( replaceRE "&#34;" "\"" ( $content | safeHTML ) ) }}</pre>
+  {{- end }}>{{ $content | htmlEscape | safeHTML }}</pre>
 {{- .Store.Set "hasMermaid" true }}
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 39b268fe7b..3948b1a67b 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.1.1+a23eb3a9d8baa6fe6adc764815db03e70e98a381
\ No newline at end of file
+7.1.1+9955fc97bd7471bc6c7fc2d4ed9133f95f93729b
\ No newline at end of file