diff --git a/public/main/survey/question.php b/public/main/survey/question.php
index a71f4f5b0e..bd3ce1366c 100644
--- a/public/main/survey/question.php
+++ b/public/main/survey/question.php
@@ -120,7 +120,7 @@ switch ($_GET['type']) {
 }
 
 // We are editing a question
-if (isset($_GET['question_id']) && !empty($_GET['question_id'])) {
+if (!empty($_GET['question_id'])) {
     $formData = SurveyManager::get_question($_GET['question_id']);
 }
 
diff --git a/public/main/survey/survey_question.php b/public/main/survey/survey_question.php
index 55c2b9991c..1241dd8019 100644
--- a/public/main/survey/survey_question.php
+++ b/public/main/survey/survey_question.php
@@ -422,7 +422,7 @@ class survey_question
                 if ($key > $deleted) {
                     // swap with previous (deleted) option slot
                     $newAnswers[$key - 1] = $formData['answers'][$key];
-                    $newAnswersId[$key - 1] = $formData['answersid'][$key];
+                    $newAnswersId[$key - 1] = $formData['answersid'][$key] ?? 0;
                     unset($formData['answers'][$key]);
                     unset($formData['answersid'][$key]);
                 } elseif ($key === $deleted) {