diff --git a/AKPlan/views.py b/AKPlan/views.py
index f96a972611eeca0af10b4046f6d1d1e6ba424a02..cc33ebd231f2e8e92d37fab5305652574e3cb6e6 100644
--- a/AKPlan/views.py
+++ b/AKPlan/views.py
@@ -60,8 +60,11 @@ class PlanScreenView(PlanIndexView):
 
     def get_queryset(self):
         # Determine interesting range (some hours ago until some hours in the future as specified in the settings)
-        self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
-        self.end = self.start + timedelta(hours=(settings.PLAN_WALL_HOURS_RETROSPECT + settings.PLAN_WALL_HOURS_FUTURE))
+        if self.event.start < datetime.now().astimezone(self.event.timezone) < self.event.end:
+            self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
+        else:
+            self.start = self.event.start
+        self.end = self.event.end
 
         # Restrict AK slots to relevant ones
         # This will automatically filter all rooms not needed for the selected range in the orginal get_context method