diff --git a/src/frontend/src/components/forms/fields/TableField.tsx b/src/frontend/src/components/forms/fields/TableField.tsx
index fb626a3992..7f3c6439eb 100644
--- a/src/frontend/src/components/forms/fields/TableField.tsx
+++ b/src/frontend/src/components/forms/fields/TableField.tsx
@@ -29,7 +29,6 @@ export interface TableFieldRowProps {
 
 function TableFieldRow({
   item,
-  idx,
   rowId,
   errors,
   definition,
@@ -37,7 +36,6 @@ function TableFieldRow({
   removeFn
 }: Readonly<{
   item: any;
-  idx: number;
   rowId: string | number;
   errors: any;
   definition: ApiFormFieldType;
@@ -59,7 +57,6 @@ function TableFieldRow({
 
   return definition.modelRenderer({
     item: item,
-    idx: idx,
     rowId: rowId,
     rowErrors: errors,
     changeFn: changeFn,
@@ -127,6 +124,7 @@ function TableFieldComponent({
         generatedRowIdCounterRef.current += 1;
         const generatedId = `table-row-generated-${generatedRowIdCounterRef.current}`;
         generatedRowIdsRef.current.set(item, generatedId);
+
         return generatedId;
       }
 
@@ -243,7 +241,7 @@ function TableFieldComponent({
           {definition.headers?.map((header, index) => {
             return (
               <Table.Th
-                key={`table-header-${identifierString(header.title)}-${index}`}
+                key={`table-header-${identifierString(header.title)}`}
                 style={header.style}
               >
                 {header.title}
@@ -262,7 +260,6 @@ function TableFieldComponent({
               <TableFieldRow
                 key={`table-row-${rowId}`}
                 item={item}
-                idx={idx}
                 rowId={rowId}
                 errors={rowErrors(idx)}
                 definition={definition}
diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx
index 1b2680c3dc..34718738ac 100644
--- a/src/frontend/src/forms/BuildForms.tsx
+++ b/src/frontend/src/forms/BuildForms.tsx
@@ -18,7 +18,7 @@ import {
   IconTruckDelivery,
   IconUsersGroup
 } from '@tabler/icons-react';
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
 import { ModelType } from '@lib/enums/ModelType';
@@ -37,6 +37,7 @@ import {
   RenderStockItem,
   RenderStockLocation
 } from '../components/render/Stock';
+import { useWhyDidYouUpdate } from '../functions/debug';
 import { useCreateApiFormModal } from '../hooks/UseForm';
 import {
   useBatchCodeGenerator,
@@ -807,6 +808,19 @@ function BuildConsumeItemRow({
   props: TableFieldRowProps;
   record: any;
 }) {
+  const [quantity, setQuantity] = useState<number>(props.item?.quantity ?? 0);
+
+  const callChangeFn = useCallback(
+    (identifier: number | string, key: string, value: any) => {
+      queueMicrotask(() => {
+        props.changeFn(identifier, key, value);
+      });
+    },
+    [props.changeFn]
+  );
+
+  useWhyDidYouUpdate('BuildConsumeItemRow', { props, record, quantity });
+
   return (
     <Table.Tr key={`table-row-${record.pk}`}>
       <Table.Td>
@@ -824,9 +838,10 @@ function BuildConsumeItemRow({
       <Table.Td>
         <NumberInput
           radius='sm'
+          min={0}
           step={1}
           decimalScale={10}
-          value={props.item.quantity ?? ''}
+          value={quantity}
           onChange={(value: number | string) => {
             let nextValue: number | '' = '';
 
@@ -837,13 +852,14 @@ function BuildConsumeItemRow({
               nextValue = Number.isFinite(parsed) ? parsed : '';
             }
 
-            props.changeFn(props.idx, 'quantity', nextValue);
+            setQuantity(nextValue === '' ? 0 : nextValue);
+            callChangeFn(props.rowId, 'quantity', nextValue);
           }}
           error={props.rowErrors?.quantity?.message}
         />
       </Table.Td>
       <Table.Td>
-        <RemoveRowButton onClick={() => props.removeFn(props.idx)} />
+        <RemoveRowButton onClick={() => props.removeFn(props.rowId)} />
       </Table.Td>
     </Table.Tr>
   );
@@ -879,7 +895,7 @@ export function useConsumeBuildItemsForm({
           );
 
           return (
-            <BuildConsumeItemRow key={row.idx} props={row} record={record} />
+            <BuildConsumeItemRow key={row.rowId} props={row} record={record} />
           );
         }
       },
@@ -898,6 +914,7 @@ export function useConsumeBuildItemsForm({
     initialData: {
       items: allocatedItems.map((item) => {
         return {
+          id: item.pk,
           build_item: item.pk,
           quantity: item.quantity
         };
@@ -942,7 +959,7 @@ function BuildConsumeLineRow({
         />
       </Table.Td>
       <Table.Td>
-        <RemoveRowButton onClick={() => props.removeFn(props.idx)} />
+        <RemoveRowButton onClick={() => props.removeFn(props.rowId)} />
       </Table.Td>
     </Table.Tr>
   );