diff --git a/src/Symfony/Component/Form/RepeatedField.php b/src/Symfony/Component/Form/RepeatedField.php
index 3d2581b608e3..6250a9f95342 100644
--- a/src/Symfony/Component/Form/RepeatedField.php
+++ b/src/Symfony/Component/Form/RepeatedField.php
@@ -86,16 +86,23 @@ public function setData($data)
     }
 
     /**
-     * Return only value of first password field.
+     * Return the value of a child field
      *
-     * @return string The password.
+     * If the value of the first field is set, this value is returned.
+     * Otherwise the value of the second field is returned. This way,
+     * this field will never trigger a NotNull/NotBlank error if any of the
+     * child fields was filled in.
+     *
+     * @return string The field value
      */
     public function getData()
     {
-        if ($this->isSubmitted() && $this->isFirstEqualToSecond()) {
-            return $this->get($this->getOption('first_key'))->getData();
-        }
+        // Return whichever data is set. This should not return NULL if any of
+        // the fields is set, otherwise this might trigger a NotNull/NotBlank
+        // error even though some value was set
+        $data1 = $this->get($this->getOption('first_key'))->getData();
+        $data2 = $this->get($this->getOption('second_key'))->getData();
 
-        return null;
+        return $data1 ?: $data2;
     }
 }
diff --git a/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php b/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php
index 49b573a48287..cd6c0ee244f3 100644
--- a/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php
+++ b/tests/Symfony/Tests/Component/Form/RepeatedFieldTest.php
@@ -43,7 +43,7 @@ public function testSubmitUnequal()
         $this->assertEquals('bar', $this->field['second']->getDisplayedData());
         $this->assertFalse($this->field->isFirstEqualToSecond());
         $this->assertEquals($input, $this->field->getDisplayedData());
-        $this->assertEquals(null, $this->field->getData());
+        $this->assertEquals('foo', $this->field->getData());
     }
 
     public function testSubmitEqual()
@@ -58,4 +58,13 @@ public function testSubmitEqual()
         $this->assertEquals($input, $this->field->getDisplayedData());
         $this->assertEquals('foo', $this->field->getData());
     }
+
+    public function testGetDataReturnsSecondValueIfFirstIsEmpty()
+    {
+        $input = array('first' => '', 'second' => 'bar');
+
+        $this->field->submit($input);
+
+        $this->assertEquals('bar', $this->field->getData());
+    }
 }
\ No newline at end of file