diff --git a/Backend/src/services/CoursesStudent.service.ts b/Backend/src/services/CoursesStudent.service.ts
index 0a7341fe..8de77e7b 100644
--- a/Backend/src/services/CoursesStudent.service.ts
+++ b/Backend/src/services/CoursesStudent.service.ts
@@ -1231,6 +1231,9 @@ export class CoursesStudentService {
                 enrollmentProgress = result.enrollmentProgress;
             }
 
+            // Build response based on show_answers_after_completion setting
+            const showAnswers = quiz.show_answers_after_completion;
+
             return {
                 code: 200,
                 message: isPassed ? 'Quiz passed!' : 'Quiz completed',
@@ -1240,13 +1243,13 @@ export class CoursesStudentService {
                     score: earnedScore,
                     total_score: totalScore,
                     total_questions: quiz.questions.length,
-                    correct_answers: correctAnswers,
+                    correct_answers: showAnswers ? correctAnswers : undefined,
                     is_passed: isPassed,
                     passing_score: quiz.passing_score,
                     attempt_number: attemptNumber,
                     started_at: quizAttempt.started_at,
                     completed_at: quizAttempt.completed_at!,
-                    answers_review: quiz.show_answers_after_completion ? answersReview : undefined,
+                    answers_review: showAnswers ? answersReview : undefined,
                     course_progress_percentage: enrollmentProgress?.progress_percentage,
                     is_course_completed: enrollmentProgress?.is_course_completed,
                 },
diff --git a/Backend/src/types/CoursesStudent.types.ts b/Backend/src/types/CoursesStudent.types.ts
index 0e071731..1dd3f76a 100644
--- a/Backend/src/types/CoursesStudent.types.ts
+++ b/Backend/src/types/CoursesStudent.types.ts
@@ -351,7 +351,7 @@ export interface SubmitQuizResponse {
         score: number;
         total_score: number;
         total_questions: number;
-        correct_answers: number;
+        correct_answers?: number;
         is_passed: boolean;
         passing_score: number;
         attempt_number: number;