diff --git a/app/Models/CustomFieldValue.php b/app/Models/CustomFieldValue.php
index 4b079168..959a5c54 100644
--- a/app/Models/CustomFieldValue.php
+++ b/app/Models/CustomFieldValue.php
@@ -22,17 +22,26 @@ class CustomFieldValue extends Model
 
     public function setDateAnswerAttribute($value)
     {
-        $this->attributes['date_answer'] = Carbon::createFromFormat('Y-m-d', $value);
+        if ($value && $value != null) {
+            $this->attributes['date_answer'] = Carbon::createFromFormat('Y-m-d', $value);
+        }
+        $this->attributes['date_answer'] = null;
     }
 
     public function setTimeAnswerAttribute($value)
     {
-        $this->attributes['time_answer'] = date("H:i:s", strtotime($value));
+        if ($value && $value != null) {
+            $this->attributes['time_answer'] = date("H:i:s", strtotime($value));
+        }
+        $this->attributes['time_answer'] = null;
     }
 
     public function setDateTimeAnswerAttribute($value)
     {
-        $this->attributes['date_time_answer'] = Carbon::createFromFormat('Y-m-d H:i', $value);
+        if ($value && $value != null) {
+            $this->attributes['date_time_answer'] = Carbon::createFromFormat('Y-m-d H:i', $value);
+        }
+        $this->attributes['time_answer'] = null;
     }
 
     public function getDefaultAnswerAttribute()
diff --git a/resources/assets/js/components/custom-fields/DateField.vue b/resources/assets/js/components/custom-fields/DateField.vue
index 10beaa4d..e62527e9 100644
--- a/resources/assets/js/components/custom-fields/DateField.vue
+++ b/resources/assets/js/components/custom-fields/DateField.vue
@@ -72,11 +72,9 @@ export default {
       deep: true,
     },
   },
-  mounted() {
+  created() {
     this.date =
-      this.field && this.field.defaultAnswer
-        ? this.field.defaultAnswer
-        : new Date()
+      this.field && this.field.defaultAnswer && this.field.defaultAnswer
     this.placeholder =
       this.field && this.field.placeholder ? this.field.placeholder : ''
   },
diff --git a/resources/assets/js/views/invoices/Create.vue b/resources/assets/js/views/invoices/Create.vue
index d14efa4a..092a92e7 100644
--- a/resources/assets/js/views/invoices/Create.vue
+++ b/resources/assets/js/views/invoices/Create.vue
@@ -460,7 +460,7 @@ export default {
       taxPerItem: null,
       discountPerItem: null,
       isLoadingInvoice: false,
-      isLoadingData: false,
+      isLoadingData: true,
       isLoading: false,
       maxDiscount: 0,
       invoicePrefix: null,
@@ -832,10 +832,9 @@ export default {
 
               if (res2.data) {
                 let customFields = res2.data.customFields.data
-                this.setEditCustomFields(fields, customFields)
+                await this.setEditCustomFields(fields, customFields)
               }
             }
-
             this.isLoadingInvoice = false
           })
           .catch((error) => {