diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 6efb54d5e..593373bc8 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -1313,7 +1313,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
     ->inject('dbForProject')
     ->inject('database')
     ->inject('events')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
+    ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, Response $response, Database $dbForProject, EventDatabase $database, Event $events) {
 
         $attribute = createAttribute($databaseId, $collectionId, new Document([
             'key' => $key,
diff --git a/app/views/console/databases/collection.phtml b/app/views/console/databases/collection.phtml
index 19454a88d..652439857 100644
--- a/app/views/console/databases/collection.phtml
+++ b/app/views/console/databases/collection.phtml
@@ -315,7 +315,7 @@ $permissions = $this->getParam('permissions', null);
                             <div class="link new-attribute-boolean"><i class="avatar icon-boolean"></i> New Boolean Attribute</div>
                         </li>
                         <li>
-                            <div class="link new-attribute-datetime"><i class="avatar icon-string"></i> New DateTime Attribute</div>
+                            <div class="link new-attribute-datetime"><i class="avatar icon-datetime"></i> New DateTime Attribute</div>
                         </li>
                         <li>
                             <div class="link new-attribute-url"><i class="avatar icon-link"></i> New URL Attribute</div>
@@ -719,10 +719,10 @@ $permissions = $this->getParam('permissions', null);
 
         <label for="xdefault">Default Value</label>
         <template x-if="!(array || required)">
-            <input name="xdefault" type="datetime-local" class="margin-bottom-large">
+            <input name="xdefault" type="datetime-local" step=".001" data-cast-to="string-datetime" class="margin-bottom-large">
         </template>
         <template x-if="(array || required)">
-            <input name="xdefault" type="datetime-local" class="margin-bottom-large" disabled value="">
+            <input name="xdefault" type="datetime-local" step=".001" data-cast-to="string-datetime" class="margin-bottom-large" disabled value="">
         </template>
 
         <footer>
diff --git a/app/views/console/databases/document.phtml b/app/views/console/databases/document.phtml
index 4ce2da02a..36b9a1f09 100644
--- a/app/views/console/databases/document.phtml
+++ b/app/views/console/databases/document.phtml
@@ -102,7 +102,7 @@ $permissions = $this->getParam('permissions', null);
                                     <?php endif; ?>
 
                                     <fieldset name="data" data-cast-to="object" data-ls-attrs="x-init=doc = {{project-document}}" x-data="{doc: {}}">
-                                        <ul data-ls-attrs="x-init=attributes = {{project-collection.attributes}}" x-data="{attributes: []}">
+                                        <ul data-ls-attrs="x-init=attributes = {{project-collection.attributes}}.map(function(attr) { if(attr.type === 'datetime' && doc[attr.key]) { doc[attr.key] = isoToLocal(doc[attr.key]) } return attr; })" x-data="{attributes: [], isoToLocal(isoTime) { const date = new Date(isoTime); const localTime = date.toLocaleString('sv').slice(0, 16).replace(' ', 'T'); return localTime; } }">
                                             <template x-for="attr in attributes.filter(a => a.status === 'available')">
                                                 <li>
                                                     <label>
@@ -151,7 +151,7 @@ $permissions = $this->getParam('permissions', null);
                                                                     :name="attr.key"
                                                                     :required="attr.required"
                                                                     x-model="doc[attr.key]"
-                                                                    data-cast-to="string" />
+                                                                    data-cast-to="string-datetime" />
                                                             </template>
                                                             <template x-if="attr.type === 'string' && !attr.format">
                                                                 <textarea 
@@ -261,7 +261,7 @@ $permissions = $this->getParam('permissions', null);
                                                                                 :name="attr.key"
                                                                                 :required="attr.required"
                                                                                 x-model="doc[attr.key][index]"
-                                                                                data-cast-to="string" />
+                                                                                data-cast-to="string-datetime" />
                                                                         </template>
                                                                         <template x-if="attr.type === 'string' && !attr.format">
                                                                             <textarea 
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 19a8d7347..357df94b9 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -3937,6 +3937,7 @@ request.onerror=function(){reject(new Error("Network Error"));};request.send(par
 return new Intl.DateTimeFormat(navigator.languages,{hourCycle:'h24',...format}).format(new Date(datetime));}
 return{format:format,}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,from,to,){if(value&&Array.isArray(value)&&to!=='array'){value=value.map(element=>cast(element,from,to));return value;}
 switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'float':value=parseFloat(value);break;case'string':value=value.toString();if(value.length===0){value=null;}
+break;case'string-datetime':if(value.length===0){value=null;}else{const date=new Date(value);value=date.toISOString();}
 break;case'json':value=(value)?JSON.parse(value):[];break;case'array':if(value&&value.constructor&&value.constructor===Array){break;}
 if(from==='csv'){if(value.length===0){value=[];}else{value=value.split(',');}}else{value=[value];}
 break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 1ce692ef9..40edce16e 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -525,6 +525,7 @@ request.onerror=function(){reject(new Error("Network Error"));};request.send(par
 return new Intl.DateTimeFormat(navigator.languages,{hourCycle:'h24',...format}).format(new Date(datetime));}
 return{format:format,}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,from,to,){if(value&&Array.isArray(value)&&to!=='array'){value=value.map(element=>cast(element,from,to));return value;}
 switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'float':value=parseFloat(value);break;case'string':value=value.toString();if(value.length===0){value=null;}
+break;case'string-datetime':if(value.length===0){value=null;}else{const date=new Date(value);value=date.toISOString();}
 break;case'json':value=(value)?JSON.parse(value):[];break;case'array':if(value&&value.constructor&&value.constructor===Array){break;}
 if(from==='csv'){if(value.length===0){value=[];}else{value=value.split(',');}}else{value=[value];}
 break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
diff --git a/public/scripts/services/form.js b/public/scripts/services/form.js
index 1e146dbb7..b21417575 100644
--- a/public/scripts/services/form.js
+++ b/public/scripts/services/form.js
@@ -25,6 +25,14 @@
                         value = null;
                     }
                     break;
+                case 'string-datetime':
+                    if (value.length === 0) {
+                        value = null;
+                    } else {
+                        const date = new Date(value);
+                        value = date.toISOString();
+                    }
+                    break;
                 case 'json':
                     value = (value) ? JSON.parse(value) : [];
                     break;