diff --git a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php
index 1a93041..8838341 100644
--- a/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/DatetimeHandler.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Driver\Fields\Drupal8;
 
+use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
 
 /**
@@ -21,14 +22,14 @@ public function expand($values) {
         // Get time, convert to ISO 8601 date in GMT/UTC, remove TZ offset.
         $values[$key] = substr(gmdate('c', strtotime($relative)), 0, 19);
       }
-      else {
+      elseif ($this->fieldInfo->getSetting('datetime_type') === 'datetime') {
         // A Drupal install has a default site timezone, but nonetheless
         // uses UTC for internal storage. If no timezone is specified in a date
         // field value by the step author, assume the default timezone of
         // the Drupal install, and therefore transform it into UTC for storage.
         $date = new \DateTime($value, $siteTimezone);
         $date->setTimezone($storageTimezone);
-        $values[$key] = $date->format('Y-m-d\TH:i:s');
+        $values[$key] = $date->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
       }
     }
     return $values;