diff --git a/CustomFields/CustomFieldChoice.php b/CustomFields/CustomFieldChoice.php
index c9129138d..46df61a0a 100644
--- a/CustomFields/CustomFieldChoice.php
+++ b/CustomFields/CustomFieldChoice.php
@@ -153,8 +153,8 @@ class CustomFieldChoice extends AbstractCustomField
             ))
             ->add(self::OTHER_VALUE_LABEL, TranslatableStringFormType::class, array(
                 'label' => 'Other value label (empty if use by default)'))
-            ->add(self::CHOICES, new ChoicesType(), array(
-                'type' => new ChoicesListType($this->defaultLocales),
+            ->add(self::CHOICES, ChoicesType::class, array(
+                'entry_type' => new ChoicesListType($this->defaultLocales),
                 'allow_add' => true
             ));