diff --git a/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java b/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java
index 2fe58e1..ae14f40 100644
--- a/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java
+++ b/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java
@@ -530,6 +530,7 @@ public class QuizzManagerImpl implements QuizzManager {
             qfNode.set("done", JsonNodeFactory.instance.booleanNode(qf.isDone()));
 
             List<Answer> answers = answerRepository.findByFormAndQuestionIn(qf, questions);
+            answers.sort((a1,a2) -> Integer.compare(a1.getQuestion().getIndex(),a2.getQuestion().getIndex()));
             ArrayNode answersNode = JsonNodeFactory.instance.arrayNode();
             for(int i=0;i<answers.size();i++) {
                 answersNode.add(answers.get(i).getValue());