diff --git a/src/Controllers/Controller.php b/src/Controllers/Controller.php
index 60e0be2e..9ec2b904 100644
--- a/src/Controllers/Controller.php
+++ b/src/Controllers/Controller.php
@@ -130,19 +130,31 @@ public function getContentByType($data_type, $data_row, $value)
                 $return_value = $value;
                 break;
             case 'time':
-                $z_removed = explode('.', $value)[0];
-                $time = explode('T', $z_removed)[1];
-                $return_value = $time;
+                if ($value == null){
+                    $return_value = $value;
+                }else{
+                    $z_removed = explode('.', $value)[0];
+                    $time = explode('T', $z_removed)[1];
+                    $return_value = $time;
+                }
                 break;
             case 'date':
-                $z_removed = explode('.', $value)[0];
-                $date = explode('T', $z_removed)[0];
-                $return_value = $date;
+                if($value == null){
+                    $return_value = $value;
+                }else{
+                    $z_removed = explode('.', $value)[0];
+                    $date = explode('T', $z_removed)[0];
+                    $return_value = $date;
+                }
                 break;
             case 'datetime':
-                $z_removed = explode('.', $value)[0];
-                $date_time = str_replace('T', ' ', $z_removed);
-                $return_value = $date_time;
+                if($value == null){
+                    $return_value = $value;
+                }else{
+                    $z_removed = explode('.', $value)[0];
+                    $date_time = str_replace('T', ' ', $z_removed);
+                    $return_value = $date_time;
+                }
                 break;
             case 'select':
                 $return_value = $value;
@@ -373,7 +385,6 @@ public function insertData($data, $data_type)
                     }
                 }
             }
-
             $id = DB::table($data_type->name)->insertGetId($new_data);
             $model = DB::table($data_type->name)->where('id', $id)->first();
             foreach ($data as $key => $value) {
@@ -567,7 +578,7 @@ public function updateData($data, $data_type)
                     }
 
                     if (in_array($data_row->type, [
-                        'number',
+                        'number','datetime','date','time'
                     ])) {
                         $new_data[$key] = $this->getContentByType($data_type, $data_row, $value) !== null ? $this->getContentByType($data_type, $data_row, $value) : null;
                     } else {
diff --git a/src/resources/js/pages/crud-generated/edit.vue b/src/resources/js/pages/crud-generated/edit.vue
index a8670b94..914a7cf0 100644
--- a/src/resources/js/pages/crud-generated/edit.vue
+++ b/src/resources/js/pages/crud-generated/edit.vue
@@ -26,7 +26,6 @@
                 <template v-if="dataRow.edit && dataRow.type !== 'hidden'">
                   <!-- <input type="text" v-model="dataRow.value"> -->
                   <!-- <vs-input type="text" v-model="dataRow.value"></vs-input> -->
-
                   <badaso-text
                     v-if="dataRow.type == 'text'"
                     :label="dataRow.displayName"
@@ -503,16 +502,7 @@ export default {
               data.value = parseInt(
                 this.record[this.$caseConvert.stringSnakeToCamel(data.field)]
               );
-            } else if (data.type == "datetime" || data.type == "date") {
-              var dateValue = this.record[
-                this.$caseConvert.stringSnakeToCamel(data.field)
-              ]
-                ? this.record[
-                    this.$caseConvert.stringSnakeToCamel(data.field)
-                  ].replace(" ", "T")
-                : null;
-              data.value = new Date(dateValue);
-            } else if (data.value == undefined && data.type == "hidden") {
+            }else if (data.value == undefined && data.type == "hidden") {
               data.value = data.details.value ? data.details.value : "";
             } else if (
               data.type == "text" ||
@@ -526,7 +516,25 @@ export default {
               ]
                 ? this.record[this.$caseConvert.stringSnakeToCamel(data.field)]
                 : "";
-            } else if (
+            }
+            else if(data.type == "datetime"){
+                data.value = this.record[
+                this.$caseConvert.stringSnakeToCamel(data.field)
+              ]
+                ? this.record[
+                    this.$caseConvert.stringSnakeToCamel(data.field)
+                  ].replace(" ", "T")
+                : null;
+            }else if(data.type == "date"){
+                var val = this.record[
+                this.$caseConvert.stringSnakeToCamel(data.field)
+              ]
+                ? this.record[
+                    this.$caseConvert.stringSnakeToCamel(data.field)
+                  ].replace(" ", "T")
+                : null;
+                data.value = val !== null ? new Date(val) : val;
+            }else if(
               data.type == "relation" &&
               data.relation.relationType == "belongs_to_many"
             ) {