diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 41172d6732c812ac6311786a86594da4650fe6d2..8e2ba63245acb6364292d20def6a39a578affdd6 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -234,12 +234,12 @@ class LessonPeriodQuerySet(LessonDataQuerySet):
             return None
 
     def daily_lessons_for_person(self, person: Person, wanted_day: date) -> Optional[models.QuerySet]:
-        lesson_periods = LessonPeriod.objects.filter_from_person(person)
-
-        if lesson_periods is None:
+        if person.timetable_type is None:
             return None
 
-        return lesson_periods.on_day(wanted_day)
+        lesson_periods = LessonPeriod.objects.on_day(wanted_day).filter_from_person(person)
+
+        return lesson_periods
 
     def per_period_one_day(self) -> OrderedDict:
         """ Group selected lessons per period for one day """