diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 09d81ee7afd74..1a6a2ca7ba395 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -248,7 +248,7 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         $emptyValue = function (Options $options) {
-            return $options['required'] ? null : '';
+            return ($options['required'] && empty($options['choices'])) || !$options['required'] ? '' : null;
         };
 
         // for BC with the "empty_value" option