diff --git a/apps/web-app/src/app/features/assessment/state/use-assessment-survey-questions.ts b/apps/web-app/src/app/features/assessment/state/use-assessment-survey-questions.ts
index af7af8d..cbc2122 100644
--- a/apps/web-app/src/app/features/assessment/state/use-assessment-survey-questions.ts
+++ b/apps/web-app/src/app/features/assessment/state/use-assessment-survey-questions.ts
@@ -161,6 +161,7 @@ export const useAssessmentSurveyQuestions = (assessment: UserAssessment,
             updatedAssessment.askedQuestion[question.question.id] = true;
             updatedAssessment.responseValue[question.question.id] = answerValue;
             updatedAssessment.questionTime[question.question.id] = time;
+            updatedAssessment.currentQuestion = question.question.id;
             if (comment) {
                 updatedAssessment.comment[question.question.id] = comment;
             }