diff --git a/repository/question/question.go b/repository/question/question.go
index 88415a2..5fa0485 100644
--- a/repository/question/question.go
+++ b/repository/question/question.go
@@ -371,9 +371,9 @@ func (r *QuestionRepository) GetMapQuestions(ctx context.Context, allAnswers []m
 			return nil, []model.ResultAnswer{}, err
 		}
 		if questionData.Type != model.TypeResult {
+			questionData.AnswerID = answer.AnswerID
 			questions = append(questions, questionData)
 			questionMap[answer.AnswerID] = questionData.Title
-			questionData.AnswerID = answer.AnswerID
 		}
 	}
 	sort.Slice(questions, func(i, j int) bool {