diff --git a/acqui/moddeliverydate.pl b/acqui/moddeliverydate.pl
index 50de045d81..975fccdb95 100755
--- a/acqui/moddeliverydate.pl
+++ b/acqui/moddeliverydate.pl
@@ -55,7 +55,7 @@ my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} )
 
 if($op and $op eq 'save') {
     my $estimated_delivery_date = $input->param('estimated_delivery_date');
-    $order->{'estimated_delivery_date'} = dt_from_string( $estimated_delivery_date );
+    $order->{'estimated_delivery_date'} = $estimated_delivery_date ? dt_from_string( $estimated_delivery_date ) : undef;
     ModOrder($order);
     print $input->redirect($referrer);
     exit;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index c068e87460..02c785c73a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -599,7 +599,7 @@
                         <td class="actions">
                             [% books_loo.estimated_delivery_date | $KohaDates %]
                             [% IF CAN_user_acquisition_order_manage %]
-                            <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]">
+                            <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | $KohaDates %]">
                                 <i class="fa fa-pencil"></i> Edit
                             </a>
                         </td>
@@ -1056,10 +1056,10 @@
                 e.preventDefault();
                 var ordernumber = $(this).data("ordernumber");
                 var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
-                var date_text = $( "#delivery_date_" + ordernumber ).html();
+                var date_text = $( "#delivery_date_" + ordernumber ).data("delivery_date");
                 $("#dateEditor .modal-title").text(modalTitle);
                 $("#date_ordernumber").val(ordernumber);
-                $("#estimated_delivery_date").html( date_text );
+                $("#estimated_delivery_date").val(date_text);
                 $("#dateEditor").modal("show");
             });