diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 060f6e46c1..de49441f3a 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -426,7 +426,7 @@ describe.each([
         const saved = (await loadRow(id, table._id!)).body
 
         expect(saved.stringUndefined).toBe(undefined)
-        expect(saved.stringNull).toBe("")
+        expect(saved.stringNull).toBe(null)
         expect(saved.stringString).toBe("i am a string")
         expect(saved.numberEmptyString).toBe(null)
         expect(saved.numberNull).toBe(null)
diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index dd1f9a272a..cbddcaf427 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -46,23 +46,23 @@ export const TYPE_TRANSFORM_MAP: any = {
     parse: parseArrayString,
   },
   [FieldTypes.STRING]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.BARCODEQR]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.FORMULA]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.LONGFORM]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.NUMBER]: {
@@ -71,6 +71,11 @@ export const TYPE_TRANSFORM_MAP: any = {
     [undefined]: undefined,
     parse: n => parseFloat(n),
   },
+  [FieldTypes.BIGINT]: {
+    "": null,
+    [null]: null,
+    [undefined]: undefined,
+  },
   [FieldTypes.DATETIME]: {
     "": null,
     [undefined]: undefined,