diff --git a/src/Storage/Field/Type/FieldTypeBase.php b/src/Storage/Field/Type/FieldTypeBase.php
index <HASH>..<HASH> 100644
--- a/src/Storage/Field/Type/FieldTypeBase.php
+++ b/src/Storage/Field/Type/FieldTypeBase.php
@@ -115,6 +115,9 @@ abstract class FieldTypeBase implements FieldTypeInterface
     public function set($entity, $value)
     {
         $key = $this->mapping['fieldname'];
+        if (!$value) {
+            $value = $this->mapping['data']['default'];
+        }
         $entity->$key = $value;
     }
use the default value if there is nothing set