diff --git a/app/views/components/analytics/matomo.twig b/app/views/components/analytics/matomo.twig
index 9ce7c44..dc551d6 100644
--- a/app/views/components/analytics/matomo.twig
+++ b/app/views/components/analytics/matomo.twig
@@ -1,6 +1,6 @@
 <!-- Matomo -->
 <script type="text/javascript">
-  var _paq = window._paq || [];
+  var _paq = window._paq = window._paq || [];
   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
@@ -9,7 +9,7 @@
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '{{ config("matomo_analytics_site_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='//cdn.matomo.cloud/directorylister.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
+    g.type='text/javascript'; g.async=true; g.src='//cdn.matomo.cloud/'+u.match(/https?:\/\/(.*\.matomo\.cloud)/)[1].+'/matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
 <!-- End Matomo Code -->