diff --git a/frontend/index.html b/frontend/index.html
index 80fc9f82..2ee8d7a7 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Loading REEV...</title>
-    
+
     <!-- Matomo -->
     <script>
       var _paq = window._paq = window._paq || [];
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index f20881a3..6dbd0afd 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -5,7 +5,7 @@
  */
 // Components
 // Composables
-import { createApp } from 'vue'
+import { createApp, nextTick } from 'vue'
 
 // Plugins
 import { registerPlugins } from '@/plugins'
@@ -18,6 +18,9 @@ async function bootstrap() {
   await registerPlugins(app)
 
   app.mount('#app')
+
+  await nextTick()
+  window._paq.push(['trackPageView'])
 }
 
 bootstrap()
diff --git a/frontend/src/plugins/matomo.ts b/frontend/src/plugins/matomo.ts
index 3489b3af..4097c7d2 100644
--- a/frontend/src/plugins/matomo.ts
+++ b/frontend/src/plugins/matomo.ts
@@ -12,17 +12,17 @@ async function setupMatomo(app: App, router: any) {
   try {
     const client = new SettingsClient()
     const response = await client.fetchFrontendSettings()
-    if (!response['matomo_host'] || !response['matomo_site_id']) {
-      throw new Error('Matomo host and site ID must be set')
+    if (response['matomo_host'] && response['matomo_site_id']) {
+      app.use(VueMatomo, {
+        host: response['matomo_host'],
+        siteId: response['matomo_site_id'],
+        router: router,
+        enableLinkTracking: true,
+        trackInitialView: true,
+        requireConsent: true,
+        disableCookies: true
+      })
     }
-
-    app.use(VueMatomo, {
-      host: response['matomo_host'],
-      siteId: response['matomo_site_id'],
-      router: router,
-      requireConsent: true,
-      disableCookies: true
-    })
   } catch (error) {
     console.error('Failed to initialize Matomo:', error)
   }