diff --git a/Controller/CustomFieldsGroupController.php b/Controller/CustomFieldsGroupController.php
index 47bd43c7b..3b802d3b8 100644
--- a/Controller/CustomFieldsGroupController.php
+++ b/Controller/CustomFieldsGroupController.php
@@ -259,7 +259,6 @@ class CustomFieldsGroupController extends Controller
                     ))
               ->add('type', ChoiceType::class, array(
                     'choices' => array_combine(array_values($fieldChoices),array_keys($fieldChoices)),
-                    'choices_as_values' => true
                    ))
               ->add('customFieldsGroup', HiddenType::class)
               ->add('submit', SubmitType::class);
diff --git a/CustomFields/CustomFieldChoice.php b/CustomFields/CustomFieldChoice.php
index 8996aa1c3..17012ecd1 100644
--- a/CustomFields/CustomFieldChoice.php
+++ b/CustomFields/CustomFieldChoice.php
@@ -130,7 +130,6 @@ class CustomFieldChoice extends AbstractCustomField
                 'choices' => array(
                     'Multiple' => '1',
                     'Unique' => '0'),
-                'choices_as_values' => true,
                 'empty_data' => '0',
                 'label' => 'Multiplicity'
                 ))
@@ -140,7 +139,6 @@ class CustomFieldChoice extends AbstractCustomField
                 'choices' => array(
                     'Expanded' => '1',
                     'Non expanded' => '0'),
-                'choices_as_values' => true,
                 'empty_data' => '0',
                 'label' => 'Choice display'
                 ))
@@ -149,7 +147,6 @@ class CustomFieldChoice extends AbstractCustomField
                 'choices' => array(
                     'No' => '0',
                     'Yes' => '1'),
-                'choices_as_values' => true,
                 'empty_data' => '0',
                 'expanded' => true,
                 'multiple' => false
diff --git a/CustomFields/CustomFieldLongChoice.php b/CustomFields/CustomFieldLongChoice.php
index 3f9dfaadb..feca7e351 100644
--- a/CustomFields/CustomFieldLongChoice.php
+++ b/CustomFields/CustomFieldLongChoice.php
@@ -82,7 +82,6 @@ class CustomFieldLongChoice extends AbstractCustomField
                 }
                 return $key->getId();
             },
-            'choices_as_values' => true,
             'multiple' => false,
             'expanded' => false,
             'required' => $customField->isRequired(),
@@ -113,7 +112,6 @@ class CustomFieldLongChoice extends AbstractCustomField
         return $builder->add(self::KEY, ChoiceType::class, array(
             'choices' => array_combine(array_values($choices),array_keys($choices)),
             'label' => 'Options key',
-            'choices_as_values' => true
         ));
 
     }
diff --git a/CustomFields/CustomFieldText.php b/CustomFields/CustomFieldText.php
index 9b3e1a3ba..abd6e7911 100644
--- a/CustomFields/CustomFieldText.php
+++ b/CustomFields/CustomFieldText.php
@@ -130,7 +130,6 @@ class CustomFieldText extends AbstractCustomField
                    'Multiple boxes on the line' => '1',
                    'One box on the line' => '0'
                    ),
-                'choices_as_values' => true,
                 'label' => 'Box appearance',
                 'expanded' => True
                ))
diff --git a/CustomFields/CustomFieldTitle.php b/CustomFields/CustomFieldTitle.php
index 5d2d10cd8..64a7fbba8 100644
--- a/CustomFields/CustomFieldTitle.php
+++ b/CustomFields/CustomFieldTitle.php
@@ -109,7 +109,6 @@ class CustomFieldTitle extends AbstractCustomField
                     'Subtitle' => self::TYPE_SUBTITLE
                 ),
                'label' => 'Title level',
-               'choices_as_values' => true
             )
         );
     }
diff --git a/Form/CustomFieldsGroupType.php b/Form/CustomFieldsGroupType.php
index 24eba07b9..64e461c95 100644
--- a/Form/CustomFieldsGroupType.php
+++ b/Form/CustomFieldsGroupType.php
@@ -49,7 +49,6 @@ class CustomFieldsGroupType extends AbstractType
             ->add('name', TranslatableStringFormType::class)
             ->add('entity', ChoiceType::class, array(
                 'choices' => array_combine(array_values($entities),array_keys($entities)),
-                'choices_as_values' => true
             ))
         ;
 
diff --git a/Form/Type/LinkedCustomFieldsType.php b/Form/Type/LinkedCustomFieldsType.php
index d71c503e6..a5e955fdd 100644
--- a/Form/Type/LinkedCustomFieldsType.php
+++ b/Form/Type/LinkedCustomFieldsType.php
@@ -109,7 +109,6 @@ class LinkedCustomFieldsType extends AbstractType
 
         $options = array_merge($this->options, array(
                 'choices' => $choices,
-                'choices_as_values' => true
             ));
 
         $event->getForm()->getParent()->add($this->choiceName, ChoiceType::class,