diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index a4b060195e..81d5545c40 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -365,13 +365,11 @@
 
   function getAllowedTypes() {
     if (originalName) {
-      const possibleTypes = (
-        SWITCHABLE_TYPES[field.type] || [editableColumn.type]
-      ).map(t => t.toLowerCase())
+      const possibleTypes = SWITCHABLE_TYPES[field.type] || [
+        editableColumn.type,
+      ]
       return Object.entries(FIELDS)
-        .filter(([fieldType]) =>
-          possibleTypes.includes(fieldType.toLowerCase())
-        )
+        .filter(([_, field]) => possibleTypes.includes(field.type))
         .map(([_, fieldDefinition]) => fieldDefinition)
     }
 
diff --git a/packages/frontend-core/src/utils/rows.js b/packages/frontend-core/src/utils/rows.js
index ea43d63734..50f676983d 100644
--- a/packages/frontend-core/src/utils/rows.js
+++ b/packages/frontend-core/src/utils/rows.js
@@ -8,6 +8,10 @@ const isBetterSample = (newValue, oldValue) => {
     return true
   }
 
+  if (oldValue != null && newValue == null) {
+    return false
+  }
+
   // Don't change type
   const oldType = typeof oldValue
   const newType = typeof newValue