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 e1799e3fe8..8ef4ec64cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -859,7 +859,7 @@
                     <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
                 </div>
                 <div class="modal-body">
-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | $KohaDates %]"/>
+                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]"/>
                 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                 <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
                 <input type="hidden" name="op" value="save" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 5d5ecf9107..82983da851 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -308,7 +308,7 @@
                     <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
                 </div>
                 <div class="modal-body">
-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
+                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
                 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                 <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
                 <input type="hidden" name="op" value="save" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
index 4a5b738ea2..d7512ccaf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt
@@ -36,7 +36,7 @@
       <form action="/cgi-bin/koha/acqui/moddeliverydate.pl" method="post">
         <fieldset class="brief">
           <label for="estimated_delivery_date">Estimated delivery date:</label>
-          <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
+          <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
           <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
         </fieldset>
         <input type="hidden" name="referrer" value="[% referrer | html %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 56992ac1a4..451d55f1f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -513,7 +513,7 @@
             </li>
             <li>
                 <label for="estimated_delivery_date">Estimated delivery date: </label>
-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
+                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
                 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
             </li>
             <li>