diff --git a/src/lib/components/WinScreen.svelte b/src/lib/components/WinScreen.svelte
index 0e69813..487a634 100644
--- a/src/lib/components/WinScreen.svelte
+++ b/src/lib/components/WinScreen.svelte
@@ -71,14 +71,6 @@
 
   // Generate the congratulations message
   let congratulationsMessage = $derived(getRandomCongratulationsMessage());
-
-  onMount(() => {
-    if (typeof window !== "undefined" && (window as any).umami) {
-      (window as any).umami.track("guessed-correctly", {
-        totalGuesses: guessCount,
-      });
-    }
-  });
 </script>
 
 <div
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index ecdb4f0..577c09d 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -86,8 +86,16 @@
       `Guess: ${book.name} (order ${book.order}), Correct: ${correctBook.name} (order ${correctBook.order}), Adjacent: ${adjacent}`
     );
 
-    if (guesses.length === 0 && browser && (window as any).umami) {
-      (window as any).umami.track("first-guess");
+    if (guesses.length === 0) {
+      const key = `bibdle-first-guess-${dailyVerse.date}`;
+      if (
+        localStorage.getItem(key) !== "true" &&
+        browser &&
+        (window as any).umami
+      ) {
+        (window as any).umami.track("First guess");
+        localStorage.setItem(key, "true");
+      }
     }
 
     guesses = [
@@ -264,6 +272,18 @@
     submitStats();
   });
 
+  $effect(() => {
+    if (!browser || !isWon) return;
+    const key = `bibdle-win-tracked-${dailyVerse.date}`;
+    if (localStorage.getItem(key) === "true") return;
+    if ((window as any).umami) {
+      (window as any).umami.track("Guessed correctly", {
+        totalGuesses: guesses.length,
+      });
+    }
+    localStorage.setItem(key, "true");
+  });
+
   function generateShareText(): string {
     const emojis = guesses
       .slice()