diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/CreateQuestions.jsx b/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/CreateQuestions.jsx
index 23d5319ee5..6657ffc02e 100644
--- a/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/CreateQuestions.jsx
+++ b/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/CreateQuestions.jsx
@@ -75,7 +75,6 @@ export function CreateQuestions() {
                 const updatedQuestions = [...questions.slice(0, index), questionParams, ...questions.slice(index + 1)];
                 setQuestions(updatedQuestions);
                 const validQuestions = updatedQuestions.filter(question => isValidQuestion(question));
-
                 await actions.interactivityCenter.addQuestionsToPoll(id, validQuestions);
               }}
               isQuiz={isQuiz}
diff --git a/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/SavedQuestion.tsx b/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/SavedQuestion.tsx
index 526f003734..a201abc15f 100644
--- a/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/SavedQuestion.tsx
+++ b/packages/roomkit-react/src/Prebuilt/components/Polls/CreateQuestions/SavedQuestion.tsx
@@ -15,6 +15,7 @@ export const SavedQuestion = ({
   length: number;
   convertToDraft: (draftID: number) => void;
 }) => {
+  const answerArray = [question?.answer?.option, ...(question.answer?.options || [])];
   return (
     <>
       <Text variant="overline" css={{ c: '$on_surface_low', textTransform: 'uppercase' }}>
@@ -29,8 +30,9 @@ export const SavedQuestion = ({
           <Text variant="body2" css={{ c: '$on_surface_medium' }}>
             {option.text}
           </Text>
+          {/* Fix needed here */}
           {/* @ts-ignore */}
-          {option.isCorrectAnswer && (
+          {(answerArray.includes(index + 1) || option.isCorrectAnswer) && (
             <Flex css={{ color: '$alert_success', mx: '$xs' }}>
               <CheckCircleIcon height={24} width={24} />
             </Flex>