diff --git a/apps/expo/src/screens/play-test/index.tsx b/apps/expo/src/screens/play-test/index.tsx
index 468c250..fbab7b3 100644
--- a/apps/expo/src/screens/play-test/index.tsx
+++ b/apps/expo/src/screens/play-test/index.tsx
@@ -212,7 +212,7 @@ export const PlayTestScreen: FC<RootStackScreenProps<"PlayTest">> = ({
       const mappedChoices = choices.map((choice) => ({
         text: choice.text ?? "",
         isCorrect: choice.isCorrect,
-        isChosen: choice.isSelected,
+        isChosen: selectedChoice?.id === choice.id,
       }));
       return prevQuestionHistories.concat([
         {
@@ -269,7 +269,7 @@ export const PlayTestScreen: FC<RootStackScreenProps<"PlayTest">> = ({
       const mappedChoices = choices.map((choice) => ({
         text: choice.text ?? "",
         isCorrect: choice.isCorrect,
-        isChosen: choice.isSelected,
+        isChosen: choiceStatus[choice.id] ?? false,
       }));
       return prevQuestionHistories.concat([
         {
diff --git a/apps/expo/src/screens/test-history/question.tsx b/apps/expo/src/screens/test-history/question.tsx
index bcc8635..b4c5b22 100644
--- a/apps/expo/src/screens/test-history/question.tsx
+++ b/apps/expo/src/screens/test-history/question.tsx
@@ -189,6 +189,13 @@ export const QuestionHistoryScreen: FC<QuestionHistoryProps> = ({
               ))
               .exhaustive()}
           </View>
+          <Text className="mx-6 mb-5 mt-10 text-center text-xl font-bold leading-loose text-black">
+            Your Answer:{" "}
+            {question.choices
+              .filter((choice) => choice.isChosen)
+              .map((choice) => choice.text)
+              .join(", ")}
+          </Text>
         </ScrollView>
       </SafeAreaView>
     </>
diff --git a/packages/api/src/router/testHistory.ts b/packages/api/src/router/testHistory.ts
index 150a70c..9c52c38 100644
--- a/packages/api/src/router/testHistory.ts
+++ b/packages/api/src/router/testHistory.ts
@@ -27,6 +27,9 @@ export const testHistoryRouter = router({
             },
           },
         },
+        orderBy: {
+          createdAt: "desc",
+        },
       });
     }),