diff --git a/layouts/_partials/components/analytics/matomo.html b/layouts/_partials/components/analytics/matomo.html
index ac916515..02b81b52 100644
--- a/layouts/_partials/components/analytics/matomo.html
+++ b/layouts/_partials/components/analytics/matomo.html
@@ -3,6 +3,16 @@
 https://developer.matomo.org/guides/tracking-javascript-guide
 */ -}}
 
+{{- with .Site.Params.analytics.matomo -}}
+
+{{- if not .serverURL }}
+  {{- errorf "Missing Matomo 'serverURL' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#matomo-analytics" -}}
+{{- end -}}
+
+{{- if not .websiteID }}
+  {{- errorf "Missing Matomo 'websiteID' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#matomo-analytics" -}}
+{{- end -}}
+
 <!-- Matomo -->
 <script type="text/javascript">
   var _paq = window._paq = window._paq || [];
@@ -17,3 +27,5 @@
   })();
 </script>
 <!-- End Matomo Code -->
+
+{{- end -}}
diff --git a/layouts/_partials/components/analytics/umami.html b/layouts/_partials/components/analytics/umami.html
index 814dd55f..9cb3ae4f 100644
--- a/layouts/_partials/components/analytics/umami.html
+++ b/layouts/_partials/components/analytics/umami.html
@@ -6,11 +6,11 @@
 {{- with .Site.Params.analytics.umami -}}
 
 {{- if not .serverURL }}
-  {{- errorf "Missing Umami 'serverURL' configuration. See TODO" -}}
+  {{- errorf "Missing Umami 'serverURL' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#umami-analytics" -}}
 {{- end -}}
 
 {{- if not .websiteID }}
-  {{- errorf "Missing Umami 'websiteID' configuration. See TODO" -}}
+  {{- errorf "Missing Umami 'websiteID' configuration. See https://imfing.github.io/hextra/versions/latest/docs/guide/configuration/#umami-analytics" -}}
 {{- end -}}
 
 {{- $attributes := newScratch -}}