diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php
index 2f61d572..0dc5a43e 100644
--- a/src/Controller/WarrantyController.php
+++ b/src/Controller/WarrantyController.php
@@ -371,8 +371,4 @@ class WarrantyController extends Controller
                 ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
         }
     }
-
-
-
-
 }
diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig
index d1d4592f..d99470cb 100644
--- a/templates/warranty/form.html.twig
+++ b/templates/warranty/form.html.twig
@@ -142,7 +142,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="date_expire">Expiry Date</label>
                                         <div class="input-group date dp">
-                                            <input type="text" name="date_expire" class="form-control m-input" value="{{ obj.getDateExpire|default("now")|date('d M Y') }}" readonly placeholder="Select a date">
+                                            <input type="text" name="date_expire" class="form-control m-input" value="{{ obj.getDateExpire is empty? "" : obj.getDateExpire|date('Y-m-d') }}" value="{{ obj.getDateExpire is empty? "" : obj.getDateExpire|date('Y-m-d')  }}" readonly placeholder="Select a date">
                                             <span class="input-group-addon">
                                                 <i class="la la-calendar glyphicon-th"></i>
                                             </span>