diff --git a/src/CoreBundle/Repository/ExtraFieldValuesRepository.php b/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
index 6212f4b658..b723233ec8 100644
--- a/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
+++ b/src/CoreBundle/Repository/ExtraFieldValuesRepository.php
@@ -91,6 +91,7 @@ class ExtraFieldValuesRepository extends ServiceEntityRepository
             ->setParameter('field', $extraField)
         ;
 
+        /** @var ?ExtraFieldValues $extraFieldValues */
         $extraFieldValues = $qb->getQuery()->getOneOrNullResult();
         $em = $this->getEntityManager();
 
@@ -101,13 +102,12 @@ class ExtraFieldValuesRepository extends ServiceEntityRepository
                 ->setFieldValue($data)
             ;
             $em->persist($extraFieldValues);
-            $em->flush();
         } else {
-            $extraFieldValues->setValue($data);
-            $em->persist($extraFieldValues);
-            $em->flush();
+            $extraFieldValues->setFieldValue($data);
         }
 
+        $em->flush();
+
         return $extraFieldValues;
     }
 }