diff --git a/lxl-web/src/lib/components/Matomo.svelte b/lxl-web/src/lib/components/Matomo.svelte
index 8d063fc78..e96791843 100644
--- a/lxl-web/src/lib/components/Matomo.svelte
+++ b/lxl-web/src/lib/components/Matomo.svelte
@@ -1,14 +1,20 @@
 <script lang="ts">
 	import { env } from '$env/dynamic/public';
 	import { afterNavigate } from '$app/navigation';
-	import { setMatomoTracker, getMatomoTracker } from '$lib/contexts/matomo';
+	import { setMatomoTracker, getMatomoTracker, setMatomoContext } from '$lib/contexts/matomo';
 
 	const URL: string = env.PUBLIC_MATOMO_URL;
 
-	setMatomoTracker();
+	setMatomoContext();
 	const tracker = getMatomoTracker();
 
-	afterNavigate(async ({ to, from }) => {
+	function onMatomoScriptLoad() {
+		if (!$tracker) {
+			setMatomoTracker();
+		}
+	}
+
+	afterNavigate(async ({ to, from, type }) => {
 		if ($tracker) {
 			if (from?.url.href) {
 				$tracker.setReferrerUrl(from.url.href);
@@ -16,14 +22,17 @@
 			if (to?.url.href) {
 				$tracker.setCustomUrl(to.url.href);
 			}
-			$tracker.trackPageView(document.title);
+			if (type !== 'enter') {
+				// First track is done on init (when script is ready)
+				$tracker.trackPageView(document.title);
+			}
 		}
 	});
 </script>
 
 <svelte:head>
 	{#if URL}
-		<script async defer src={`${URL}/matomo.js`}></script>
+		<script async defer src={`${URL}/matomo.js`} on:load={onMatomoScriptLoad}></script>
 	{/if}
 </svelte:head>
 <slot />
diff --git a/lxl-web/src/lib/contexts/matomo.ts b/lxl-web/src/lib/contexts/matomo.ts
index 0588b0a21..8fff5458c 100644
--- a/lxl-web/src/lib/contexts/matomo.ts
+++ b/lxl-web/src/lib/contexts/matomo.ts
@@ -7,6 +7,8 @@ import { setContext, getContext } from 'svelte';
 
 const MATOMO_ID: number = +env.PUBLIC_MATOMO_ID;
 
+const tracker = writable<MatomoTracker>();
+
 function initMatomo() {
 	if (browser) {
 		const matomo = window.Matomo;
@@ -16,6 +18,7 @@ function initMatomo() {
 			if (tracker) {
 				tracker.disableCookies(); // TODO - remove when cookie consent implemented
 				tracker.enableLinkTracking();
+				tracker.trackPageView();
 				return tracker;
 			}
 		}
@@ -25,11 +28,16 @@ function initMatomo() {
 export function setMatomoTracker() {
 	const initializedMatomoTracker = initMatomo();
 	if (initializedMatomoTracker) {
-		const tracker = writable<MatomoTracker>(initializedMatomoTracker);
-		setContext('matomo', tracker);
+		tracker.set(initializedMatomoTracker);
+		console.info('Matomo tracker set');
 	}
 }
 
+export function setMatomoContext() {
+	setMatomoTracker();
+	setContext('matomo', tracker);
+}
+
 export function getMatomoTracker() {
 	return getContext<Writable<MatomoTracker>>('matomo');
 }