diff --git a/src/routes/sunrise-sunset/+page.svelte b/src/routes/sunrise-sunset/+page.svelte
index 217f9cb..1bd198a 100644
--- a/src/routes/sunrise-sunset/+page.svelte
+++ b/src/routes/sunrise-sunset/+page.svelte
@@ -82,7 +82,7 @@
       return;
     }
 
-    currentStreakLength = streakCalculator.getStreakLength(
+    currentStreakLength = streakCalculator.getCurrentStreakLengthForCorrectDays(
       $guessingHistory.correctDays
     );
     localStorage.setItem(localStorageKey, JSON.stringify(value));
diff --git a/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.test.ts b/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.test.ts
index 87094b9..661a061 100644
--- a/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.test.ts
+++ b/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.test.ts
@@ -9,7 +9,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const correctDays = [];
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(anyDay).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(anyDay).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(0);
@@ -21,7 +23,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const today = '2023-01-29';
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(1);
@@ -33,7 +37,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const today = '2023-01-29';
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(2);
@@ -45,7 +51,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const today = '2023-01-28';
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(1);
@@ -56,7 +64,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const correctDays = ['2023-01-26', '2023-01-27', '2023-01-31'];
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator('2023-01-31').getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(
+                '2023-01-31'
+            ).getCurrentStreakLengthForCorrectDays(correctDays);
 
             // THEN
             expect(currentStreakLength).toBe(1);
@@ -68,7 +78,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const today = '2023-01-28';
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(2);
@@ -80,7 +92,9 @@ describe('SunriseSunsetStreakCalculator', () => {
             const today = '2023-01-28';
 
             // WHEN
-            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getStreakLength(correctDays);
+            const currentStreakLength = new SunriseSunsetStreakCalculator(today).getCurrentStreakLengthForCorrectDays(
+                correctDays
+            );
 
             // THEN
             expect(currentStreakLength).toBe(3);
diff --git a/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.ts b/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.ts
index e05da1e..d1a3add 100644
--- a/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.ts
+++ b/src/routes/sunrise-sunset/SunriseSunsetStreakCalculator.ts
@@ -1,4 +1,4 @@
-import { parse, format as formatDate, differenceInCalendarDays } from 'date-fns';
+import { parse, format as formatDate, differenceInCalendarDays, isSameDay } from 'date-fns';
 import { SunriseSunsetDayGuess } from './SunriseSunsetDayGuess.js';
 import { SunriseSunsetDayGuessSet } from './SunriseSunsetGuessSet.js';
 import { GuessType } from './GuessType.js';
@@ -9,7 +9,10 @@ class SunriseSunsetStreak {
     readonly mostRecentStreak: number;
 
     constructor(correctDays: Date[], today = new Date()) {
-        if (correctDays.length === 0) {
+        const isCorrectDaysEmpty = correctDays.length === 0;
+
+        if (isCorrectDaysEmpty) {
+            console.log(`No correct days recorded.`);
             this.longestStreak = 0;
             this.mostRecentStreak = 0;
             this.allStreaks = [];
@@ -47,17 +50,26 @@ class SunriseSunsetStreak {
             [1]
         );
 
-        // The streaks are in reverse order, so the most recent streak is the last one.
-        console.log('allStreaks', allStreaks);
-        this.mostRecentStreak = allStreaks[0] ?? 0;
         this.longestStreak = allStreaks.length > 0 ? Math.max(...allStreaks) : 0;
         this.allStreaks = allStreaks;
+
+        const isTodayMissingFromCorrectDays = !correctDays.some((day) => isSameDay(day, today));
+
+        // The streaks are in reverse order, so the most recent streak is the last one.
+        if (allStreaks[0] === undefined) {
+            this.mostRecentStreak = 0;
+        } else if (isTodayMissingFromCorrectDays) {
+            this.mostRecentStreak = 0;
+        } else {
+            this.mostRecentStreak = allStreaks[0];
+        }
     }
 }
 
 export class SunriseSunsetStreakCalculator {
     private readonly todayDate: Date;
-    constructor(private readonly today: string) {
+
+    constructor(today: string) {
         this.todayDate = parse(today, 'yyyy-MM-dd', new Date());
     }
 
@@ -77,11 +89,18 @@ export class SunriseSunsetStreakCalculator {
         return streak;
     }
 
+    getCurrentStreakLengthForCorrectDays(correctDays: string[]): number {
+        const streak = new SunriseSunsetStreak(this.daysAsDates(correctDays), this.todayDate);
+
+        return streak.mostRecentStreak;
+    }
+
     getShareableStatement(correctDays: string[], incorrectDays: string[], today: Date, joiningString = '\n'): string {
-        const emoji = this.getEmojiForHistory(correctDays, incorrectDays);
-        const todayFormatted = formatDate(today, 'yyyy-MM-dd');
         const streak = new SunriseSunsetStreak(this.daysAsDates(correctDays));
-        const currentStreak = this.getStreakLength(correctDays);
+        const todayFormatted = formatDate(today, 'yyyy-MM-dd');
+
+        const emoji = this.getEmojiForHistory(correctDays, incorrectDays);
+        const currentStreak = this.getCurrentStreakLengthForCorrectDays(correctDays);
 
         return [
             `Sunrise, Sunset?`,
@@ -91,32 +110,4 @@ export class SunriseSunsetStreakCalculator {
             `Longest Streak: ${streak.longestStreak}`,
         ].join(joiningString);
     }
-
-    getStreakLength(correctDays: string[]): number {
-        if (correctDays.length === 0) {
-            console.log(`No correct days, returning 0.`);
-            return 0;
-        } else if (!correctDays.some((day) => day === this.today)) {
-            console.log(`Today is not in the list of correct days`);
-            return 0;
-        }
-
-        const daysAsDates = this.daysAsDates(correctDays);
-
-        const sortedDaysWithoutToday = correctDays
-            .filter((day) => day !== this.today)
-            .map((day) => parse(day, 'yyyy-MM-dd', new Date()))
-            .sort((a, b) => b.getTime() - a.getTime());
-
-        const daysBetweenTodayAndMostRecentDay = differenceInCalendarDays(this.todayDate, sortedDaysWithoutToday[0]);
-
-        if (daysBetweenTodayAndMostRecentDay > 1) {
-            console.log(`Today is more than one day after the most recent correct day`);
-            return 1;
-        }
-
-        const streaks = new SunriseSunsetStreak(daysAsDates);
-
-        return streaks.mostRecentStreak;
-    }
 }