diff --git a/react-openapi/components/GenericForm.tsx b/react-openapi/components/GenericForm.tsx
index fea85a2..b2bf82c 100644
--- a/react-openapi/components/GenericForm.tsx
+++ b/react-openapi/components/GenericForm.tsx
@@ -77,9 +77,12 @@ export default function GenericForm({
   const relationDataMap = React.useMemo(() => {
     const map: Record<string, any[]> = {};
     allRelations.forEach((relName, index) => {
-      // @ts-ignore
-      map[relName] = queries[index].data || [];
+      const queryResult = queries[index];
+      const dataArray = queryResult?.data && Array.isArray(queryResult.data) ? queryResult.data : (queryResult?.data?.data ?? []);
+      console.log('Relation query result for', relName, 'raw:', queryResult?.data);
+      map[relName] = dataArray;
     });
+    console.log('Final relationDataMap:', map);
     return map;
   }, [allRelations, queries]);