diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts
index b0cddf3fdfaf04925f8e275f43d7c83800cdd3f2..d6db954724fa9e4d3b2ca7bf738f6dbdd5769429 100644
--- a/src/services/challenge.service.ts
+++ b/src/services/challenge.service.ts
@@ -622,6 +622,9 @@ export default class ChallengeService {
         if (userChallenge.quiz.result > userChallenge.progress.quizProgress) {
           userChallenge.progress.quizProgress = userChallenge.quiz.result
         }
+        if (userChallenge.progress.quizProgress > 5) {
+          userChallenge.progress.quizProgress = 5
+        }
         updatedQuiz = await quizService.endUserQuiz(userChallenge.quiz)
         updatedUserChallenge = {
           ...userChallenge,
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index 9c81bba29208dcfa73367f0168e9df5693877fa2..8624f3d0fdea6bf5a2510e290c6431c8d7dcd1a3 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -257,9 +257,11 @@ export default class QuizService {
       }
       userQuiz.customQuestion = updatedQuestion
     }
+    let quizScoreLimit = userQuiz.result
+    quizScoreLimit = quizScoreLimit + 1 > 5 ? 5 : quizScoreLimit + 1
     const updatedUserQuiz: UserQuiz = {
       ...userQuiz,
-      result: questionResult ? userQuiz.result + 1 : userQuiz.result,
+      result: questionResult ? quizScoreLimit : userQuiz.result,
     }
     return updatedUserQuiz
   }