diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index 3d8ab8faa..eba607f04 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -966,8 +966,6 @@ public function getSubmissions(string $hash): DataResponse {
 	 * @param array $answerArray [arrayOfString]
 	 */
 	private function storeAnswersForQuestion($submissionId, array $question, array $answerArray) {
-		$question = $questions[$questionIndex];
-
 		foreach ($answerArray as $answer) {
 			$answerText = '';
 
@@ -1092,6 +1090,8 @@ public function insertSubmission(int $formId, array $answers, string $shareHash
 				continue;
 			}
 
+			$question = $questions[$questionIndex];
+
 			$this->storeAnswersForQuestion($submission->getId(), $question, $answerArray);
 		}