diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 28f48c13f3..7d4c599fbc 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -75,7 +75,9 @@
             <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
         {{ end }}
         <script>
-            mermaid.initialize({ startOnLoad: true });
+            if (mermaid) {
+                mermaid.startOnLoad = false;
+            }
         </script>
     {{ end }}
     {{ partial "custom-footer.html" . }}
diff --git a/static/js/hugo-relearn.js b/static/js/hugo-relearn.js
index 9fab8ded64..26c75f93fc 100644
--- a/static/js/hugo-relearn.js
+++ b/static/js/hugo-relearn.js
@@ -87,8 +87,12 @@ jQuery(document).ready(function() {
       e.clearSelection();
       $(e.trigger).attr('aria-label', 'Link copied to clipboard!').addClass('tooltipped tooltipped-s');
   });
+
   $('code.language-mermaid').each(function(index, element) {
     var content = $(element).html().replace(/&amp;/g, '&');
     $(element).parent().replaceWith('<div class="mermaid" align="center">' + content + '</div>');
   });
+  if (mermaid) {
+    mermaid.init(undefined, $('.mermaid'));
+  }
 });