diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 601583b783..19f1d62e4f 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -413,6 +413,7 @@ class ChoiceType extends AbstractType
             // See https://github.com/symfony/symfony/pull/5582
             'data_class' => null,
             'choice_translation_domain' => true,
+            'trim' => false,
         ));
 
         $resolver->setNormalizer('choices', $choicesNormalizer);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 842136e14c..875a0ba0f6 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -2421,4 +2421,59 @@ class ChoiceTypeTest extends BaseTypeTest
             'multiple, expanded' => array(true, true, array(array())),
         );
     }
+
+    /**
+     * @dataProvider provideTrimCases
+     */
+    public function testTrimIsDisabled($multiple, $expanded)
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'multiple' => $multiple,
+            'expanded' => $expanded,
+            'choices' => array(
+                'a' => '1',
+            ),
+            'choices_as_values' => true,
+        ));
+
+        $submittedData = ' 1';
+
+        $form->submit($multiple ? (array) $submittedData : $submittedData);
+
+        // When the choice does not exist the transformation fails
+        $this->assertFalse($form->isSynchronized());
+        $this->assertNull($form->getData());
+    }
+
+    /**
+     * @dataProvider provideTrimCases
+     */
+    public function testSubmitValueWithWhiteSpace($multiple, $expanded)
+    {
+        $valueWhitWhiteSpace = '1 ';
+
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'multiple' => $multiple,
+            'expanded' => $expanded,
+            'choices' => array(
+                'a' => $valueWhitWhiteSpace,
+            ),
+            'choices_as_values' => true,
+        ));
+
+        $form->submit($multiple ? (array) $valueWhitWhiteSpace : $valueWhitWhiteSpace);
+
+        $this->assertTrue($form->isSynchronized());
+        $this->assertSame($multiple ? (array) $valueWhitWhiteSpace : $valueWhitWhiteSpace, $form->getData());
+    }
+
+    public function provideTrimCases()
+    {
+        return array(
+            'Simple' => array(false, false),
+            'Multiple' => array(true, false),
+            'Simple expanded' => array(false, true),
+            'Multiple expanded' => array(true, true),
+        );
+    }
 }