diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index 6ae67200..8a9745ca 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -76,13 +76,14 @@ abstract class BaseAdminController extends AbstractController
             $em->persist($entity);
             $em->flush();
             $this->addFlash('success', $this->translator->trans('entity.edit_flash'));
+
+            //Rebuild form, so it is based on the updated data. Important for the parent field!
+            //We can not use dynamic form events here, because the parent entity list is build from database!
+            $form = $this->createForm($this->form_class, $entity);
         } elseif ($form->isSubmitted() && ! $form->isValid()) {
             $this->addFlash('error', $this->translator->trans('entity.edit_flash.invalid'));
         }
 
-        //Rebuild form, so it is based on the updated data. Important for the parent field!
-        $form = $this->createForm($this->form_class, $entity);
-
         return $this->render($this->twig_template, [
             'entity' => $entity,
             'form' => $form->createView()