diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
index 1598770..158ab18 100644
--- a/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
+++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php
@@ -29,7 +29,6 @@ class Wiaas_Admin_Order_Process_Flow {
 
 	public static function add_custom_fields_after_order_details($order){
 		$global_estimated_delivery_date = Wiaas_Order::get_global_estimated_date($order->id);
-		$formated_global_estimated_delivery_date = $global_estimated_delivery_date ? date("Y-m-d", $global_estimated_delivery_date) : "";
 		
 		$order_id = $order->id;
 		require 'views/html-order-global-delivery-date.php';
diff --git a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-global-delivery-date.php b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-global-delivery-date.php
index dc8d28a..ecfaeaf 100644
--- a/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-global-delivery-date.php
+++ b/backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-global-delivery-date.php
@@ -7,7 +7,7 @@ if ( ! defined( 'ABSPATH' ) ) {
     <p class="form-field form-field-wide">
     <label for="estimated-delivery-date">Estimated delivery date:</label>
     <input id="estimated-delivery-date" name="estimated-delivery-date" 
-           type="date" value="<?php echo $formated_global_estimated_delivery_date ?>"
+           type="date" value="<?php echo $global_estimated_delivery_date ? date("Y-m-d", $global_estimated_delivery_date) : ""; ?>"
            onChange="onGlobalEstimatedDeliveryDateChange(this.value)"/>
 	</p>