diff --git a/lib/Form/DataTransformer/TranslatablePropertyTransformer.php b/lib/Form/DataTransformer/TranslatablePropertyTransformer.php
index 54515a459..d3375a4fa 100644
--- a/lib/Form/DataTransformer/TranslatablePropertyTransformer.php
+++ b/lib/Form/DataTransformer/TranslatablePropertyTransformer.php
@@ -38,9 +38,7 @@ public function transform($valueAsHash)
 
     public function reverseTransform($value)
     {
-        if (!$value) {
-            return null;
-        }
+        $value = (false === $value || [] === $value) ? null : $value;
 
         return [$this->languageCode => $value];
     }
diff --git a/tests/RepositoryForms/Form/DataTransformer/TranslatablePropertyTransformerTest.php b/tests/RepositoryForms/Form/DataTransformer/TranslatablePropertyTransformerTest.php
index 766380f5d..fa6148f90 100644
--- a/tests/RepositoryForms/Form/DataTransformer/TranslatablePropertyTransformerTest.php
+++ b/tests/RepositoryForms/Form/DataTransformer/TranslatablePropertyTransformerTest.php
@@ -62,8 +62,8 @@ public function testReverseTransform($inputValue, $languageCode, $expected)
     public function reverseTransformProvider()
     {
         return [
-            [false, 'fre-FR', null],
-            [null, 'fre-FR', null],
+            [false, 'fre-FR', ['fre-FR' => null]],
+            [null, 'fre-FR', ['fre-FR' => null]],
             ['français', 'fre-FR', ['fre-FR' => 'français']],
             ['english', 'eng-GB', ['eng-GB' => 'english']],
             ['norsk', 'nor-NO', ['nor-NO' => 'norsk']],