diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
index b05209c611efdb7bbf8c2f042ba9eb63db5042f3..6645476d47cbe7b7cbacc0ecc2c421073bf9ee25 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
@@ -43,8 +43,7 @@ class DatabaseRowDateTimeFields implements FormDataProviderInterface
                     // makes date() treat it as a UTC date (which is what we store in the database).
                     $result['databaseRow'][$column] = date('c', strtotime($result['databaseRow'][$column] . ' UTC'));
                 } else {
-                    // Set to 0 timestamp
-                    $result['databaseRow'][$column] = 0;
+                    $result['databaseRow'][$column] = null;
                 }
             } else {
                 // its a UNIX timestamp! We do not modify this here, as it will only be treated as a datetime because
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index c2be5a44a8d79d4ea81b3402494c04e47cf3bde3..c2ffc063e59bed02bffff70a57cb4b45c623b86a 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -1729,7 +1729,7 @@ class DataHandler
         // normal integer "date" fields (timestamps) are handled in checkValue_input_Eval
         if (isset($tcaFieldConf['dbType']) && ($tcaFieldConf['dbType'] === 'date' || $tcaFieldConf['dbType'] === 'datetime')) {
             if (empty($value)) {
-                $value = 0;
+                $value = null;
             } else {
                 $isDateOrDateTimeField = true;
                 $dateTimeFormats = QueryHelper::getDateTimeFormats();
@@ -1739,7 +1739,7 @@ class DataHandler
                 $emptyValue = $dateTimeFormats[$tcaFieldConf['dbType']]['empty'];
                 // We store UTC timestamps in the database, which is what getTimestamp() returns.
                 $dateTime = new \DateTime($value);
-                $value = $value === $emptyValue ? 0 : $dateTime->getTimestamp();
+                $value = $value === $emptyValue ? null : $dateTime->getTimestamp();
             }
         }
         // Secures the string-length to be less than max.
@@ -1770,6 +1770,10 @@ class DataHandler
             }
 
             $res = $this->checkValue_input_Eval($value, $evalCodesArray, $tcaFieldConf['is_in']);
+            if (isset($tcaFieldConf['dbType']) && isset($res['value']) && !$res['value']) {
+                // set the value to null if we have an empty value for a native field
+                $res['value'] = null;
+            }
 
             // Process UNIQUE settings:
             // Field is NOT set for flexForms - which also means that uniqueInPid and unique is NOT available for flexForm fields! Also getUnique should not be done for versioning and if PID is -1 ($realPid<0) then versioning is happening...