diff --git a/Form/Type/ModelType.php b/Form/Type/ModelType.php index fd1b614d5a..86b17ba62f 100644 --- a/Form/Type/ModelType.php +++ b/Form/Type/ModelType.php @@ -53,12 +53,11 @@ public function getDefaultOptions() 'parent' => 'choice', 'preferred_choices' => array(), 'choice_list' => function (Options $options, $previousValue) { - - if ($previousValue instanceof ChoiceListInterface + if ($previousValue instanceof ChoiceListInterface && count($choices = $previousValue->getChoices())) { return $choices; } - + return new ModelChoiceList( $options['model_manager'], $options['class'],