diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4dc84f4..1162af7 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -3,6 +3,14 @@
 
 <head>
     {{- partial "head.html" . }}
+    {{ if .Page.Store.Get "hasChart" }}
+    <script
+        src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"
+        integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
+        crossorigin="anonymous"
+        referrerpolicy="no-referrer"
+    ></script>
+    {{ end }}
 </head>
 
 <body class="
@@ -25,14 +33,6 @@
     mermaid.initialize({ startOnLoad: true });
   </script>
 {{ end }}
-{{/*  {{ if .Page.Store.Get "hasChart" }}
-<script
-    src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"
-    integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
-    crossorigin="anonymous"
-    referrerpolicy="no-referrer"
-></script>
-{{ end }}  */}}
 
 
 </html>
diff --git a/layouts/shortcodes/chart.html b/layouts/shortcodes/chart.html
index be1aa04..67ec6d6 100644
--- a/layouts/shortcodes/chart.html
+++ b/layouts/shortcodes/chart.html
@@ -1,17 +1,13 @@
 <div>
     <h1>TEST</h1>
-    <canvas id='{{ .Get "id"}}' width='{{ .Get "width" }}' height='{{ .Get "height" }}'></canvas>
-    <script
-        src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"
-        integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA=="
-        crossorigin="anonymous"
-        referrerpolicy="no-referrer">
-    </script>
+    {{ $data := index .Site.Data (split (.Get "data") ".") }}
+    {{ $chartID := .Get "id" | default (md5 (jsonify $data)) }}
+    <canvas id='{{ $chartID }}' width='{{ .Get "width" }}' height='{{ .Get "height" }}'></canvas>
     <script>
         (function () {
-            var ctx = document.getElementById('{{ .Get "id"}}');
-            var myChart = new Chart(ctx, {{ index .Site.Data (split (.Get "data") ".") }});
+            var ctx = document.getElementById('{{ $chartID }}');
+            var myChart = new Chart(ctx, {{ $data }});
         })();
     </script>
 </div>
-{{/*  {{ .Page.Store.Set "hasChart" true }}  */}}
+{{ .Page.Store.Set "hasChart" true }}
