diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ed58332..c7e3631 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -9,7 +9,7 @@
 {{- block "head" . }}{{ end }}
 {{ partial "meta_json_ld.html" . }}
 {{ partial "scripts.html" . }}
-{{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}}
+{{ partialCached "matomo.html" . }}
 </head>
 
 <body>
diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html
index 7867c62..ce3ea2b 100644
--- a/layouts/partials/matomo.html
+++ b/layouts/partials/matomo.html
@@ -1,3 +1,4 @@
+{{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID -}}
 <script>
   var _paq = window._paq || [];
   _paq.push(['trackPageView']);
@@ -10,3 +11,4 @@
     g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
+{{ end -}}