diff --git a/app/Services/Course/CoursePlayerService.php b/app/Services/Course/CoursePlayerService.php
index cd824513..6f94ae76 100644
--- a/app/Services/Course/CoursePlayerService.php
+++ b/app/Services/Course/CoursePlayerService.php
@@ -16,8 +16,8 @@ class CoursePlayerService
    {
       $user = Auth::user();
 
-      return $watching_type === 'lesson' ?
-         SectionLesson::with([
+      if ($watching_type === 'lesson') {
+         return SectionLesson::with([
             'resources',
             'forums' => function ($query) {
                $query->with([
@@ -27,13 +27,15 @@ class CoursePlayerService
                   },
                ]);
             },
-         ])->find($lesson_id) :
-         SectionQuiz::with([
-            'quiz_questions',
-            'quiz_submissions' => function ($query) use ($user) {
-               $query->where('user_id', $user->id);
-            }
-         ])->find($lesson_id);
+         ])->findOrFail($lesson_id);
+      }
+
+      return SectionQuiz::with([
+         'quiz_questions',
+         'quiz_submissions' => function ($query) use ($user) {
+            $query->where('user_id', $user->id);
+         }
+      ])->findOrFail($lesson_id);
    }
 
    function getWatchHistory(string $course_id, ?string $user_id): ?WatchHistory