diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
index d47ba9c03..319101a6c 100644
--- a/inc/formanswer.class.php
+++ b/inc/formanswer.class.php
@@ -1168,10 +1168,12 @@ public function post_addItem() {
 
             // TODO: find a way to validate the answers
             // It the form is not being validated, nothing gives the power to anyone to validate the answers
-            $this->update([
+            $formAnswer = new self();
+            $formAnswer->update([
                'id'     => $this->getID(),
                'status' => self::STATUS_WAITING,
             ]);
+            return;
          }
       }
       $this->createIssue();
@@ -1186,10 +1188,12 @@ public function post_updateItem($history = 1) {
 
             // TODO: find a way to validate the answers
             // It the form is not being validated, nothing gives the power to anyone to validate the answers
-            $this->update([
+            $formAnswer = new self();
+            $formAnswer->update([
                'id'     => $this->getID(),
                'status' => self::STATUS_WAITING,
             ]);
+            return;
          }
       }
       $this->updateIssue();