diff --git a/src/lib/Content/View/Builder/ContentEditViewBuilder.php b/src/lib/Content/View/Builder/ContentEditViewBuilder.php
index 461dbe3a..17e07763 100644
--- a/src/lib/Content/View/Builder/ContentEditViewBuilder.php
+++ b/src/lib/Content/View/Builder/ContentEditViewBuilder.php
@@ -100,7 +100,7 @@ public function buildView(array $parameters)
 
             foreach ($validationErrors as $fieldIdentifier => $validationErrorLanguages) {
                 $fieldValueElement = $form->get('fieldsData')->get($fieldIdentifier)->get('value');
-                foreach ($validationErrorLanguages as $languageCode => $validationErrors) {
+                foreach ($validationErrorLanguages as $validationErrors) {
                     if (is_array($validationErrors) === false) {
                         $validationErrors = [$validationErrors];
                     }
@@ -113,6 +113,8 @@ public function buildView(array $parameters)
             }
         }
 
+        // Reload content in case it was modified by the form handler.
+        $content = $this->resolveContent($parameters, $location, $language);
         $view->setContent($content);
         $view->setLanguage($language);
         $view->setLocation($location);