diff --git a/biscuit/apps/chronos/models.py b/biscuit/apps/chronos/models.py
index 62ff247499c860ea04ada9422e8b0c375daac397..3aa647ebdf477ba13e1312ebae29dfc7126eed0b 100644
--- a/biscuit/apps/chronos/models.py
+++ b/biscuit/apps/chronos/models.py
@@ -187,11 +187,14 @@ class LessonPeriod(SchoolRelated):
     def get_groups(self) -> models.query.QuerySet:
         return self.lesson.groups
 
-    def next_of_same_groups(self) -> Optional[LessonPeriod]:
+    def next_of_same_groups(self, same_subject=False) -> Optional[LessonPeriod]:
         res = LessonPeriod.objects
         # retrieve all LessonPeriods of this group constellation
         for group in self.lesson.groups.all():
             res = res.filter(lesson__groups__pk=group.pk)
+        # same subject?
+        if same_subject:
+            res = res.filter(lesson__subject=self.lesson.subject)
         # sorted by time
         res = res.order_by('period__weekday', 'period__period').distinct()
         # simple list of their PKs