diff --git a/apps/web/index.html b/apps/web/index.html
index e2740c0ab..5f821e469 100644
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -5,10 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>TrustSwap</title>
     <script
-      async
-      defer
-      src="https://analytics.thp.box/script.js"
-      data-website-id="13760d0b-e30d-43c2-9026-1920a86720c8">
+      async defer
+      src="https://cloud.umami.is/script.js"
+      data-website-id="13760d0b-e30d-43c2-9026-1920a86720c8"
+      data-domains="trustswap.intuition.box"
+      data-auto-track="false">
     </script>
 
     <script>
diff --git a/apps/web/src/analytics.ts b/apps/web/src/analytics.ts
index bbc1a39d1..9cfc2fab8 100644
--- a/apps/web/src/analytics.ts
+++ b/apps/web/src/analytics.ts
@@ -1,13 +1,41 @@
 declare global {
   interface Window {
     umami?: {
-      track: (eventName: string, data?: Record<string, any>) => void;
+      // Custom events
+      track: (eventName?: string, data?: Record<string, any>) => void;
+      // Official pageview API
+      trackView: (url?: string, referrer?: string | null, websiteId?: string) => void;
     };
   }
 }
 
+// Avoid duplicate tracking when rapid route updates occur
+let lastPathname: string | null = null;
+
+// Poll until the Umami script is loaded
+function whenUmamiReady(cb: () => void, tries = 20) {
+  if (typeof window !== "undefined" && window.umami) return cb();
+  if (tries <= 0) return;
+  setTimeout(() => whenUmamiReady(cb, tries - 1), 250);
+}
+
 export function trackPageView(pathname: string) {
-  if (window.umami) {
-    window.umami.track("page_view", { url: pathname });
-  }
+  if (!pathname || pathname === lastPathname) return;
+  lastPathname = pathname;
+
+  whenUmamiReady(() => {
+    if (window.umami?.trackView) {
+      // Proper pageview: shows up in the "Pageviews" metrics
+      window.umami.trackView(pathname);
+    } else if (window.umami?.track) {
+      // Fallback as a custom event (visible under "Events", not "Pageviews")
+      window.umami.track("pageview", { url: pathname });
+    }
+  });
+}
+
+export function trackEvent(name: string, data?: Record<string, any>) {
+  whenUmamiReady(() => {
+    window.umami?.track?.(name, data);
+  });
 }