diff --git a/includes/addtocalendar.build.inc b/includes/addtocalendar.build.inc
index 4bafd78..cc9bb8c 100644
--- a/includes/addtocalendar.build.inc
+++ b/includes/addtocalendar.build.inc
@@ -45,9 +45,9 @@ function _addtocalendar_preprocess_field(&$variables) {
         unset($temp);
       }
       foreach ($values as $index => $date_val) {
-        $date = new DrupalDateTime(preg_replace('/T/', ' ', $values[$index]['value']), 'UTC');
+        $date = new DrupalDateTime(preg_replace('/T/', ' ', $values[$index]['value']));
         if (!empty($values[$index]['end_value']) && isset($values[$index]['end_value'])) {
-          $end_date = new DrupalDateTime(preg_replace('/T/', ' ', $values[$index]['end_value']), 'UTC');
+          $end_date = new DrupalDateTime(preg_replace('/T/', ' ', $values[$index]['end_value']));
         }
 
         $build['addtocalendar'][$index]['atc_date_start'] = [
@@ -111,10 +111,15 @@ function _addtocalendar_preprocess_field(&$variables) {
           $build['addtocalendar'][$index]['atc_date_end']['#value'] = $end_date->format('Y-m-d H:i:s', ['timezone' => $timeZone]);
         }
 
+        // Use Time zone override configuration set on field format settings
+        if (isset($field_display['settings']['timezone_override'])) {
+          $timezone_config = $field_display['settings']['timezone_override'];
+        }
+
         $build['addtocalendar'][$index]['atc_timezone'] = [
           '#type' => 'html_tag',
           '#tag' => 'var',
-          '#value' => $timeZone,
+          '#value' => isset($timezone_config) ? $timezone_config : $timeZone,
           '#attributes' => [
             'class' => 'atc_timezone',
           ],