diff --git a/Classes/Core/Runtime/FormRuntime.php b/Classes/Core/Runtime/FormRuntime.php
index e6b0798..3a7dd29 100644
--- a/Classes/Core/Runtime/FormRuntime.php
+++ b/Classes/Core/Runtime/FormRuntime.php
@@ -277,11 +277,9 @@ protected function mapAndValidatePage(Page $page)
             $element->onSubmit($this, $value);
 
             $pageFormValues[$element->getIdentifier()] = $value;
+            $this->formState->setFormValue($element->getIdentifier(), $value);
         }
         $page->onSubmit($this, $pageFormValues);
-        foreach ($pageFormValues as $elementIdentifier => $value) {
-            $this->formState->setFormValue($elementIdentifier, $value);
-        }
 
         // The more parts the path has, the more early it is processed
         usort($propertyPathsForWhichPropertyMappingShouldHappen, function ($a, $b) {