diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
index d0ea59090..66be9aceb 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
@@ -214,13 +214,15 @@ class AccompanyingPeriodContext implements
         }
 
         $thirdParties = array_merge(
-            array_filter([$entity->getRequestorThirdParty()]),
+            array_filter(array_values([$entity->getRequestorThirdParty()])),
             array_filter(
-                array_map(
-                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getResources()->filter(
-                        static fn (Resource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getResources()->filter(
+                            static fn (Resource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
index d7fff210b..62e13789f 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@@ -117,14 +117,16 @@ class AccompanyingPeriodWorkEvaluationContext implements
         $this->accompanyingPeriodWorkContext->buildPublicForm($builder, $template, $entity->getAccompanyingPeriodWork());
 
         $thirdParties = array_merge(
-            array_filter($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray()),
-            array_filter([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()]),
+            array_filter(array_values($entity->getAccompanyingPeriodWork()->getThirdParties()->toArray())),
+            array_filter(array_values([$entity->getAccompanyingPeriodWork()->getHandlingThierParty()])),
             array_filter(
-                array_map(
-                    fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
-                        static fn (Resource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (Resource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getAccompanyingPeriodWork()->getAccompanyingPeriod()->getResources()->filter(
+                            static fn (Resource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index 583ac189c..4d49bcfba 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -178,19 +178,23 @@ final class PersonContext implements PersonContextInterface
 
         $thirdParties = array_merge(
             array_filter(
-                array_map(
-                    fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
-                    $this
-                        ->residentialAddressRepository
-                        ->findCurrentResidentialAddressByPerson($entity)
+                array_values(
+                    array_map(
+                        fn (ResidentialAddress $r): ?ThirdParty => $r->getHostThirdParty(),
+                        $this
+                            ->residentialAddressRepository
+                            ->findCurrentResidentialAddressByPerson($entity)
+                    )
                 )
             ),
             array_filter(
-                array_map(
-                    fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
-                    $entity->getResources()->filter(
-                        static fn (PersonResource $r): bool => null !== $r->getThirdParty()
-                    )->toArray()
+                array_values(
+                    array_map(
+                        fn (PersonResource $r): ?ThirdParty => $r->getThirdParty(),
+                        $entity->getResources()->filter(
+                            static fn (PersonResource $r): bool => null !== $r->getThirdParty()
+                        )->toArray()
+                    )
                 )
             )
         );