diff --git a/src/frontend/src/pages/build/BuildDetail.tsx b/src/frontend/src/pages/build/BuildDetail.tsx
index 5925d00ffa..940fa5e061 100644
--- a/src/frontend/src/pages/build/BuildDetail.tsx
+++ b/src/frontend/src/pages/build/BuildDetail.tsx
@@ -3,9 +3,7 @@ import { Group, LoadingOverlay, Stack, Table } from '@mantine/core';
 import {
   IconClipboardCheck,
   IconClipboardList,
-  IconCopy,
   IconDots,
-  IconEdit,
   IconFileTypePdf,
   IconInfoCircle,
   IconList,
@@ -122,7 +120,7 @@ export default function BuildDetail() {
         content: (
           <StockItemTable
             params={{
-              build: build.pk ?? -1,
+              build: id,
               is_building: false
             }}
           />
@@ -135,7 +133,7 @@ export default function BuildDetail() {
         content: (
           <StockItemTable
             params={{
-              consumed_by: build.pk ?? -1
+              consumed_by: id
             }}
           />
         )
@@ -147,7 +145,7 @@ export default function BuildDetail() {
         content: (
           <BuildOrderTable
             params={{
-              parent: build.pk ?? -1
+              parent: id
             }}
           />
         )
@@ -160,7 +158,7 @@ export default function BuildDetail() {
           <AttachmentTable
             endpoint={ApiPaths.build_order_attachment_list}
             model="build"
-            pk={build.pk ?? -1}
+            pk={Number(id)}
           />
         )
       },
@@ -177,7 +175,7 @@ export default function BuildDetail() {
         )
       }
     ];
-  }, [build]);
+  }, [build, id]);
 
   const editBuildOrder = useCallback(() => {
     let fields = buildOrderFields();
diff --git a/src/frontend/src/pages/part/CategoryDetail.tsx b/src/frontend/src/pages/part/CategoryDetail.tsx
index 3a4c47a9e1..30f63b6ba4 100644
--- a/src/frontend/src/pages/part/CategoryDetail.tsx
+++ b/src/frontend/src/pages/part/CategoryDetail.tsx
@@ -49,7 +49,7 @@ export default function CategoryDetail({}: {}) {
           <PartListTable
             props={{
               params: {
-                category: category.pk ?? null
+                category: id
               }
             }}
           />
@@ -62,7 +62,7 @@ export default function CategoryDetail({}: {}) {
         content: (
           <PartCategoryTable
             params={{
-              parent: category.pk ?? null
+              parent: id
             }}
           />
         )
diff --git a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
index 8c69ddacf5..f33f21dce3 100644
--- a/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
+++ b/src/frontend/src/pages/purchasing/PurchaseOrderDetail.tsx
@@ -59,7 +59,7 @@ export default function PurchaseOrderDetail() {
         name: 'line-items',
         label: t`Line Items`,
         icon: <IconList />,
-        content: order?.pk && <PurchaseOrderLineItemTable orderId={order.pk} />
+        content: <PurchaseOrderLineItemTable orderId={Number(id)} />
       },
       {
         name: 'received-stock',
@@ -81,7 +81,7 @@ export default function PurchaseOrderDetail() {
           <AttachmentTable
             endpoint={ApiPaths.purchase_order_attachment_list}
             model="order"
-            pk={order.pk ?? -1}
+            pk={Number(id)}
           />
         )
       },
@@ -91,7 +91,7 @@ export default function PurchaseOrderDetail() {
         icon: <IconNotes />,
         content: (
           <NotesEditor
-            url={apiUrl(ApiPaths.purchase_order_list, order.pk)}
+            url={apiUrl(ApiPaths.purchase_order_list, id)}
             data={order.notes ?? ''}
             allowEdit={true}
           />
diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
index b23182ac90..c3b2414732 100644
--- a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx
@@ -41,7 +41,7 @@ export default function ReturnOrderDetail() {
           <AttachmentTable
             endpoint={ApiPaths.return_order_attachment_list}
             model="order"
-            pk={order.pk ?? -1}
+            pk={Number(id)}
           />
         )
       },
@@ -51,7 +51,7 @@ export default function ReturnOrderDetail() {
         icon: <IconNotes />,
         content: (
           <NotesEditor
-            url={apiUrl(ApiPaths.return_order_list, order.pk)}
+            url={apiUrl(ApiPaths.return_order_list, id)}
             data={order.notes ?? ''}
             allowEdit={true}
           />
diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
index 0e433326bb..edcc3d3ad0 100644
--- a/src/frontend/src/pages/sales/SalesOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
@@ -69,7 +69,7 @@ export default function SalesOrderDetail() {
           <AttachmentTable
             endpoint={ApiPaths.sales_order_attachment_list}
             model="order"
-            pk={order.pk ?? -1}
+            pk={Number(id)}
           />
         )
       },
@@ -79,7 +79,7 @@ export default function SalesOrderDetail() {
         icon: <IconNotes />,
         content: (
           <NotesEditor
-            url={apiUrl(ApiPaths.sales_order_list, order.pk)}
+            url={apiUrl(ApiPaths.sales_order_list, id)}
             data={order.notes ?? ''}
             allowEdit={true}
           />
diff --git a/src/frontend/src/pages/stock/LocationDetail.tsx b/src/frontend/src/pages/stock/LocationDetail.tsx
index 4fbb3cbb56..af55680e8a 100644
--- a/src/frontend/src/pages/stock/LocationDetail.tsx
+++ b/src/frontend/src/pages/stock/LocationDetail.tsx
@@ -38,7 +38,7 @@ export default function Stock() {
         content: (
           <StockItemTable
             params={{
-              location: location.pk ?? null
+              location: id
             }}
           />
         )
@@ -50,7 +50,7 @@ export default function Stock() {
         content: (
           <StockLocationTable
             params={{
-              parent: location.pk ?? null
+              parent: id
             }}
           />
         )
diff --git a/src/frontend/src/pages/stock/StockDetail.tsx b/src/frontend/src/pages/stock/StockDetail.tsx
index 3e4272fc48..3f04626a70 100644
--- a/src/frontend/src/pages/stock/StockDetail.tsx
+++ b/src/frontend/src/pages/stock/StockDetail.tsx
@@ -111,7 +111,7 @@ export default function StockDetail() {
           <AttachmentTable
             endpoint={ApiPaths.stock_attachment_list}
             model="stock_item"
-            pk={stockitem.pk ?? -1}
+            pk={Number(id)}
           />
         )
       },
@@ -121,7 +121,7 @@ export default function StockDetail() {
         icon: <IconNotes />,
         content: (
           <NotesEditor
-            url={apiUrl(ApiPaths.stock_item_list, stockitem.pk)}
+            url={apiUrl(ApiPaths.stock_item_list, id)}
             data={stockitem.notes ?? ''}
             allowEdit={true}
           />