diff --git a/src/app/customField/controllers/CustomFieldController.php b/src/app/customField/controllers/CustomFieldController.php
index 45e46ad2d82d10110bd6d83d4f75748038b848c6..a4a24201af37836e7512de0e83a01f18bba25ac2 100644
--- a/src/app/customField/controllers/CustomFieldController.php
+++ b/src/app/customField/controllers/CustomFieldController.php
@@ -47,13 +47,13 @@ class CustomFieldController
             return $response->withStatus(400)->withJson(['errors' => 'Custom field with this label already exists']);
         }
 
-        CustomFieldModel::create([
+        $id = CustomFieldModel::create([
             'label'     => $body['label'],
             'type'      => $body['type'],
             'values'    => empty($body['values']) ? null : json_encode($body['values'])
         ]);
 
-        return $response->withStatus(204);
+        return $response->withStatus(204)->withJson(['customFieldId' => $id]);
     }
 
     public function update(Request $request, Response $response, array $args)
diff --git a/test/unitTests/app/customField/CustomFieldControllerTest.php b/test/unitTests/app/customField/CustomFieldControllerTest.php
index 4595de03c9aeab9b71c454f438a7bd2ec613ab79..11e5b0574b64f85c5051b1a7c4a795d4db88769c 100644
--- a/test/unitTests/app/customField/CustomFieldControllerTest.php
+++ b/test/unitTests/app/customField/CustomFieldControllerTest.php
@@ -30,17 +30,11 @@ class CustomFieldControllerTest extends TestCase
 
         $response     = $customFieldController->create($fullRequest, new \Slim\Http\Response());
         $this->assertSame(204, $response->getStatusCode());
+        $responseBody = json_decode((string)$response->getBody());
 
-        $field = \CustomField\models\CustomFieldModel::get([
-            'select' => ['id'], 'where' => ['label = ?'], 'data' => ['mon custom'], 'limit' => 1, 'orderBy' => ['id DESC']
-        ]);
-
-        self::$id = $field[0]['id'];
-
-        $field = \CustomField\models\CustomFieldModel::getById(['id' => self::$id]);
-        $this->assertSame('mon custom', $field['label']);
-        $this->assertSame('select', $field['type']);
+        $this->assertInternalType('int', $responseBody->customFieldId);
 
+        self::$id = $responseBody->customFieldId;
 
         //  Errors
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'POST']);