symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+2-1Lines changed: 2 additions & 1 deletion
@@ -110,9 +110,10 @@ public function loadValuesForChoices(array $choices, $value = null)
 
         // Optimize performance for single-field identifiers. We already
         // know that the IDs are used as values
+        $optimize = null === $value || is_array($value) && $value[0] === $this->idReader;
 
         // Attention: This optimization does not check choices for existence
-        if (!$this->choiceList && $this->idReader->isSingleId()) {
+        if ($optimize && !$this->choiceList && $this->idReader->isSingleId()) {
             $values = array();
 
             // Maintain order and indices of the given objects