diff --git a/client/src/helpers/survey-solutions.js b/client/src/helpers/survey-solutions.js
index 685cf578..7d02c80f 100644
--- a/client/src/helpers/survey-solutions.js
+++ b/client/src/helpers/survey-solutions.js
@@ -1,4 +1,7 @@
 const extractAnswerFromQuestion = (previous, question) => {
+  if (!question.correctAnswer) {
+    return [...previous];
+  }
   let answer = question.correctAnswer;
   if (question.getType() === 'matrix') {
     const correctAnswer = question.correctAnswer;