diff --git a/src/components/TableToolbar/AddRow.tsx b/src/components/TableToolbar/AddRow.tsx
index 13e24cd5..ebeb51c4 100644
--- a/src/components/TableToolbar/AddRow.tsx
+++ b/src/components/TableToolbar/AddRow.tsx
@@ -28,6 +28,7 @@ import {
   tableSortsAtom,
   addRowAtom,
   _updateRowDbAtom,
+  tableColumnsOrderedAtom,
 } from "@src/atoms/tableScope";
 
 export default function AddRow() {
@@ -215,10 +216,22 @@ export function AddRowArraySubTable() {
 
   const anchorEl = useRef<HTMLDivElement>(null);
   const [addRowAt, setAddNewRowAt] = useState<"top" | "bottom">("bottom");
+  const [tableColumnsOrdered] = useAtom(tableColumnsOrderedAtom, tableScope);
+
   if (!updateRowDb) return null;
 
   const handleClick = () => {
-    updateRowDb("", {}, undefined, {
+    const initialValues: Record<string, any> = {};
+
+    // Set initial values based on default values
+    for (const column of tableColumnsOrdered) {
+      if (column.config?.defaultValue?.type === "static")
+        initialValues[column.key] = column.config.defaultValue.value!;
+      else if (column.config?.defaultValue?.type === "null")
+        initialValues[column.key] = null;
+    }
+
+    updateRowDb("", initialValues, undefined, {
       index: 0,
       operation: {
         addRow: addRowAt,
diff --git a/src/hooks/useFirestoreDocAsCollectionWithAtom.ts b/src/hooks/useFirestoreDocAsCollectionWithAtom.ts
index 76fb1a09..d4a809c6 100644
--- a/src/hooks/useFirestoreDocAsCollectionWithAtom.ts
+++ b/src/hooks/useFirestoreDocAsCollectionWithAtom.ts
@@ -260,9 +260,9 @@ export function useFirestoreDocAsCollectionWithAtom<T = TableRow>(
             const addNewRow = (addTo: "top" | "bottom", base?: TableRow) => {
               let temp: T[] = [];
 
-              const newRow = (i: number) =>
-                ({
-                  ...base,
+              const newRow = (i: number) => {
+                return {
+                  ...(base ?? update),
                   _rowy_ref: {
                     id: doc(firebaseDb, path).id,
                     path: doc(firebaseDb, path).path,
@@ -271,8 +271,8 @@ export function useFirestoreDocAsCollectionWithAtom<T = TableRow>(
                       parentField: fieldName,
                     },
                   },
-                } as T);
-
+                } as T;
+              };
               setDataAtom((prevData) => {
                 temp = unsortRows(prevData);