diff --git a/src/components/EditorCanvas/Table.jsx b/src/components/EditorCanvas/Table.jsx
index 12b6727..98b5b3a 100644
--- a/src/components/EditorCanvas/Table.jsx
+++ b/src/components/EditorCanvas/Table.jsx
@@ -184,6 +184,11 @@ export default function Table(props) {
             </div>
           </div>
           {tableData.fields.map((e, i) => {
+
+            if (e.default.name && e.default.name[0].value && e.default.name[0].value === 'CURRENT_TIMESTAMP') {
+              e.default = 'CURRENT_TIMESTAMP'
+            }
+
             return settings.showFieldSummary ? (
               <Popover
                 key={i}
diff --git a/src/utils/issues.js b/src/utils/issues.js
index 90e1259..421e9ae 100644
--- a/src/utils/issues.js
+++ b/src/utils/issues.js
@@ -11,6 +11,8 @@ function checkDefault(field) {
 
   if (isFunction(field.default)) return true;
 
+  if (Array.isArray(field.default.name)) return true;
+
   if (!field.notNull && field.default.toLowerCase() === "null") return true;
 
   switch (field.type) {
@@ -124,7 +126,7 @@ export function getIssues(diagram) {
         );
       }
 
-      if (field.notNull && field.default.toLowerCase() === "null") {
+      if (field.notNull && !Array.isArray(field.default.name) && field.default.toLowerCase() === "null") {
         issues.push(
           `"${field.name}" field of table "${table.name}" is NOT NULL but has default NULL`,
         );