diff --git a/src/hooks/useInventoryData.ts b/src/hooks/useInventoryData.ts
index 253fdb2..2301454 100644
--- a/src/hooks/useInventoryData.ts
+++ b/src/hooks/useInventoryData.ts
@@ -63,17 +63,17 @@ export function useInventoryData({ companyId, activeType }: UseInventoryDataOpti
 
     try {
       const productsRes = await purchaserApi.listProducts();
-      const products: Product[] = productsRes.data;
+      const products: Product[] = productsRes.data || [];
 
       const recordResults = await Promise.all(
         products.map(p =>
-          purchaserApi.getRecords(p.id).catch(() => [] as ProductInRecord[])
+          purchaserApi.getRecords(p.id).then(r => r || []).catch(() => [] as ProductInRecord[])
         )
       );
 
       const allBatches: FabricBatch[] = [];
       const updatedProducts: ProductWithInventory[] = products.map((p, i) => {
-        const records = recordResults[i];
+        const records = recordResults[i] || [];
         const inRecords = records.filter(r => r.record_type !== 'out');
         const outRecords = records.filter(r => r.record_type === 'out');