diff --git a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt
index 513273b4..c1800c07 100644
--- a/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt
+++ b/src/main/kotlin/dsm/pick2024/domain/weekendmeal/service/QueryIsWeekendMealPeriodService.kt
@@ -38,7 +38,7 @@ class QueryIsWeekendMealPeriodService(
     }
 
     private fun findNextPeriod(today: LocalDate, periods: List<WeekendMealPeriod>): WeekendMealPeriod? {
-        return periods.filter { it.start.isAfter(today) }
-            .minByOrNull { it.start }
+        return periods.firstOrNull { it.start.isAfter(today) }
+            ?: periods.lastOrNull { it.end.isBefore(today) }
     }
 }