diff --git a/program/models.py b/program/models.py
index b093228aab92de6f6ebc25c53b068d9469b288a8..8fdc7ee3736f8b8154c1b6be51ff25f2b639d36d 100644
--- a/program/models.py
+++ b/program/models.py
@@ -824,7 +824,7 @@ class TimeSlotManager(models.Manager):
 
     @staticmethod
     def get_24h_timeslots(start):
-        end = start + timedelta(hours=24)
+        end = timezone.make_aware(start + timedelta(hours=24))
 
         return TimeSlot.objects.filter(Q(start__lte=start, end__gte=start) |
                                        Q(start__gt=start, start__lt=end)).exclude(end=start)
@@ -832,7 +832,7 @@ class TimeSlotManager(models.Manager):
     @staticmethod
     def get_7d_timeslots(start):
         start = datetime.combine(start, time(0, 0))
-        end = start + timedelta(days=7)
+        end = timezone.make_aware(start + timedelta(days=7))
 
         return TimeSlot.objects.filter(Q(start__lte=start, end__gte=start) |
                                        Q(start__gt=start, start__lt=end)).exclude(end=start)