diff --git a/ckanext/odsh/templates/base.html b/ckanext/odsh/templates/base.html
index 7a237711912adb158a9e997018d62bd0b77531ae..e7d5bc3853bb5def3f75d03b32aa276bf14a6de2 100644
--- a/ckanext/odsh/templates/base.html
+++ b/ckanext/odsh/templates/base.html
@@ -11,6 +11,7 @@
 {% block head_extras %}
 {{ super() }}
 {% set matomo_url = 'https://phpefi.schleswig-holstein.de/gsb_analytics/'%}
+{% set matomo_id = 3%}
 <!-- Matomo -->
 <script type="text/javascript">
   var _paq = _paq || [];
@@ -20,11 +21,12 @@
   (function() {
     var u="{{matomo_url}}";
     _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', '1']);
+    _paq.push(['setSiteId', '{{matomo_id}}']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
-<noscript><p><img src="{{matomo_url}}/piwik.php?idsite=3" style="border:0;" alt="" /></p></noscript>
 <!-- End Matomo Code -->
+{% endblock %}
+{% block page %}
 {% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/page.html b/ckanext/odsh/templates/page.html
index 78c275117414b197340f8176bea48ddd4d743439..567dd0bd7815c6f1544772686f32dede190712ae 100644
--- a/ckanext/odsh/templates/page.html
+++ b/ckanext/odsh/templates/page.html
@@ -3,6 +3,9 @@
 
 {%- block content %}
 {% block maintag %}<div role="main">{% endblock %}
+{% set matomo_url = 'https://phpefi.schleswig-holstein.de/gsb_analytics/'%}
+{% set matomo_id = 3%}
+<noscript><p><img src="{{matomo_url}}/piwik.php?idsite={{matomo_id}}" style="border:0;" alt="" /></p></noscript>
   <div id="content" class="container">
 <div id="testsystem">
       <p>TESTSYSTEM</p>