diff --git a/src/Handler/Course/Show.hs b/src/Handler/Course/Show.hs
index 97668deb1..7f008f0d8 100644
--- a/src/Handler/Course/Show.hs
+++ b/src/Handler/Course/Show.hs
@@ -100,23 +100,11 @@ getCShowR tid ssh csh = do
     events' <- fmap (sortOn $ courseEventTime . entityVal) . lift $ selectList [ CourseEventCourse ==. cid ] []
     events <- forM events' $ \(Entity evId ev) -> do
       evId' <- encrypt evId
+      courseEventShouldBeDisplayedInSchedule <- lift $ E.select . E.from $ \(course `E.InnerJoin` courseEvent) -> courseEventShouldBeDisplayedInSchedule (view _1 <$> mbAuth) ata course courseEvent
       mCourseEventScheduleOpt <- case mbAuth of
         Just (aid,_) -> lift $ getBy $ UniqueCourseEventScheduleOpt evId aid
         Nothing  -> return Nothing
-      let
-        currentOpt = maybe
-                     ( maybe
-                       ( maybe
-                         False
-                         ((&&) (is _Just registration) . userScheduleOccurrenceDisplayDefault . view _2)
-                         mbAuth
-                       )
-                       (courseScheduleOptOpt . entityVal)
-                       mCourseScheduleOpt
-                     )
-                     (courseEventScheduleOptOpt . entityVal)
-                     mCourseEventScheduleOpt
-      return (evId', ev, currentOpt, mCourseEventScheduleOpt)
+      return (evId', ev, courseEventShouldBeDisplayedInSchedule, mCourseEventScheduleOpt)
 
     hasSubmissionGroups <- lift . E.selectExists . E.from $ \(submissionGroupUser `E.InnerJoin` submissionGroup) -> do
       E.on $ submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId