diff --git a/components/Game.tsx b/components/Game.tsx
index cdfe87c..3bac190 100644
--- a/components/Game.tsx
+++ b/components/Game.tsx
@@ -10,6 +10,7 @@ import { sendGotifyNotification } from '../app/actions';
 interface GameProps {
     dailyPuzzle: {
         id: number;
+        puzzleNumber: number;
         audioUrl: string;
         songId: number;
         title: string;
@@ -141,7 +142,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
             }
         }
 
-        const text = `Hördle #${dailyPuzzle.id}\n${genreText}\n${speaker}${emojiGrid}\n\n#Hördle #Music\n\n${shareUrl}`;
+        const text = `Hördle #${dailyPuzzle.puzzleNumber}\n${genreText}\n${speaker}${emojiGrid}\n\n#Hördle #Music\n\n${shareUrl}`;
 
         // Try native Web Share API only on mobile devices
         const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
@@ -149,7 +150,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
         if (isMobile && navigator.share) {
             try {
                 await navigator.share({
-                    title: `Hördle #${dailyPuzzle.id}`,
+                    title: `Hördle #${dailyPuzzle.puzzleNumber}`,
                     text: text,
                 });
                 setShareText('✓ Shared!');
@@ -178,7 +179,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
     return (
         <div className="container">
             <header className="header">
-                <h1 className="title">Hördle #{dailyPuzzle.id}{genre ? ` / ${genre}` : ''}</h1>
+                <h1 className="title">Hördle #{dailyPuzzle.puzzleNumber}{genre ? ` / ${genre}` : ''}</h1>
                 <div style={{ fontSize: '0.9rem', color: '#666', marginTop: '-0.5rem', marginBottom: '1rem' }}>
                     Next puzzle in: {timeUntilNext}
                 </div>
diff --git a/lib/dailyPuzzle.ts b/lib/dailyPuzzle.ts
index 15a421c..da46eab 100644
--- a/lib/dailyPuzzle.ts
+++ b/lib/dailyPuzzle.ts
@@ -96,8 +96,23 @@ export async function getOrCreateDailyPuzzle(genreName: string | null = null) {
 
         if (!dailyPuzzle) return null;
 
+        // Calculate puzzle number (sequential day count)
+        const whereClause = genreId
+            ? { genreId: genreId }
+            : { genreId: null, specialId: null };
+
+        const puzzleCount = await prisma.dailyPuzzle.count({
+            where: {
+                ...whereClause,
+                date: {
+                    lte: dailyPuzzle.date
+                }
+            }
+        });
+
         return {
             id: dailyPuzzle.id,
+            puzzleNumber: puzzleCount,
             audioUrl: `/api/audio/${dailyPuzzle.song.filename}`,
             songId: dailyPuzzle.songId,
             title: dailyPuzzle.song.title,
@@ -183,8 +198,19 @@ export async function getOrCreateSpecialPuzzle(specialName: string) {
 
         if (!dailyPuzzle) return null;
 
+        // Calculate puzzle number
+        const puzzleCount = await prisma.dailyPuzzle.count({
+            where: {
+                specialId: special.id,
+                date: {
+                    lte: dailyPuzzle.date
+                }
+            }
+        });
+
         return {
             id: dailyPuzzle.id,
+            puzzleNumber: puzzleCount,
             audioUrl: `/api/audio/${dailyPuzzle.song.filename}`,
             songId: dailyPuzzle.songId,
             title: dailyPuzzle.song.title,