diff --git a/src/components/Controls/Date.vue b/src/components/Controls/Date.vue
index a8e8faf9..9c604325 100644
--- a/src/components/Controls/Date.vue
+++ b/src/components/Controls/Date.vue
@@ -46,6 +46,7 @@
   </div>
 </template>
 <script lang="ts">
+import { DateTime } from 'luxon';
 import { fyo } from 'src/initFyo';
 import { defineComponent, nextTick } from 'vue';
 import Base from './Base.vue';
@@ -66,7 +67,7 @@ export default defineComponent({
       }
 
       if (value instanceof Date && !Number.isNaN(value.valueOf())) {
-        return value.toISOString().split('T')[0];
+        return DateTime.fromJSDate(value).toISODate();
       }
 
       return '';
@@ -115,8 +116,6 @@ export default defineComponent({
       this.showInput = false;
 
       let value: Date | null = new Date(target.value);
-      value.setHours(0, 0, 0, 0);
-
       if (Number.isNaN(value.valueOf())) {
         value = null;
       }