diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
index 2daf280bb..a548894c9 100644
--- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
@@ -12,11 +12,7 @@ declare(strict_types=1);
 namespace Chill\FranceTravailApiBundle\ApiHelper;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Utils;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\HttpClient\Exception\HttpExceptionInterface;
 
 /**
@@ -67,19 +63,21 @@ class PartenaireRomeAppellation
         $bearer = $this->getBearer();
 
         try {
-                    $response = $this->httpClient->request(
-                      'GET', self::BASE . 'appellation/requete', [
-                          'headers' => [
-                              'Authorization' => 'Bearer '.$bearer,
-                              'Accept' => 'application/json',
-                          ],
-                            'query' => [
-                                'q' => $search
-                            ],
-                        ]
-                    );
+            $response = $this->httpClient->request(
+                'GET',
+                self::BASE.'appellation/requete',
+                [
+                    'headers' => [
+                        'Authorization' => 'Bearer '.$bearer,
+                        'Accept' => 'application/json',
+                    ],
+                    'query' => [
+                        'q' => $search,
+                    ],
+                ]
+            );
 
-                    return $response->toArray()['resultats'];
+            return $response->toArray()['resultats'];
         } catch (HttpExceptionInterface $exception) {
             throw $exception;
         }
@@ -90,14 +88,14 @@ class PartenaireRomeAppellation
         $bearer = $this->getBearer();
 
         try {
-            $response = $this->httpClient->request('GET', sprintf(self::BASE . 'appellation/%s', $code), [
-                            'headers' => [
-                                'Authorization' => 'Bearer '.$bearer,
-                                'Accept' => 'application/json',
-                            ],
-                            'query' => [
-                                'champs' => 'code,libelle,metier(code,libelle)',
-                            ],
+            $response = $this->httpClient->request('GET', sprintf(self::BASE.'appellation/%s', $code), [
+                'headers' => [
+                    'Authorization' => 'Bearer '.$bearer,
+                    'Accept' => 'application/json',
+                ],
+                'query' => [
+                    'champs' => 'code,libelle,metier(code,libelle)',
+                ],
             ]);
 
             return $response->toArray();
diff --git a/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php b/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
index 9e849ab5e..39ab23ae1 100644
--- a/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+++ b/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\JobBundle\Form\ChoiceLoader;
 
-use App\App;
 use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation;
 use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
@@ -87,6 +86,10 @@ class RomeAppellationChoiceLoader implements ChoiceLoaderInterface
                 $code = \substr($v, \strlen('original-'));
                 $appellation = $this->appellationRepository->findOneBy(['code' => $code]);
 
+                if ($appellation) {
+                    $metier = $appellation->getMetier();
+                }
+
                 if (null === $appellation) {
                     if (array_key_exists($v, $this->toBeCreated)) {
                         [$appellation, $metier] = $this->toBeCreated[$v];
@@ -101,12 +104,11 @@ class RomeAppellationChoiceLoader implements ChoiceLoaderInterface
             if (null === $appellation && '' !== $code) {
                 $def = $this->apiAppellation->getAppellation($code);
 
-                    $metier = $metier
-                        ?? $this->em->getRepository(Metier::class)
-                            ->findOneBy(['code' => $def['metier']['code']])
-                        ?? (new Metier())
-                            ->setCode($def['metier']['code'])
-                            ->setLibelle($def['metier']['libelle']);
+                $metier ??= $this->em->getRepository(Metier::class)
+                    ->findOneBy(['code' => $def['metier']['code']])
+                    ?? (new Metier())
+                        ->setCode($def['metier']['code'])
+                        ->setLibelle($def['metier']['libelle']);
 
                 $appellation = new Appellation();
 
@@ -119,7 +121,7 @@ class RomeAppellationChoiceLoader implements ChoiceLoaderInterface
                 $errorsAppellation = $this->validator->validate($appellation);
                 $errorsMetier = $this->validator->validate($metier);
 
-                if ($errorsAppellation->count() === 0 && $errorsMetier->count() === 0) {
+                if (0 === $errorsAppellation->count() && 0 === $errorsMetier->count()) {
                     $this->toBeCreated[$v] = [$appellation, $metier];
                     $this->em->persist($appellation);
                 }