diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputWrapper/utils/normalizeRelations.js b/packages/core/admin/admin/src/content-manager/components/RelationInputWrapper/utils/normalizeRelations.js
index a478d181c3..489c00f9f1 100644
--- a/packages/core/admin/admin/src/content-manager/components/RelationInputWrapper/utils/normalizeRelations.js
+++ b/packages/core/admin/admin/src/content-manager/components/RelationInputWrapper/utils/normalizeRelations.js
@@ -12,7 +12,7 @@ export const normalizeRelations = (
       pages:
         relations?.data?.pages
           ?.map((page) => [
-            ...[...page.results, ...(modifiedData?.connect ?? [])]
+            ...[...(page?.results ?? []), ...(modifiedData?.connect ?? [])]
               .map((relation) => {
                 const nextRelation = { ...relation };
 
diff --git a/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js b/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js
index f6fb68c7d6..bc99244f74 100644
--- a/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js
+++ b/packages/core/admin/admin/src/content-manager/hooks/useRelation/useRelation.js
@@ -40,7 +40,8 @@ export const useRelation = (cacheKey, { relation, search }) => {
   const relationsRes = useInfiniteQuery(['relation', cacheKey], fetchRelations, {
     enabled: !!relation?.endpoint,
     getNextPageParam(lastPage) {
-      if (lastPage.pagination.page >= lastPage.pagination.pageCount) {
+      // the API may send an empty 204 response
+      if (!lastPage || lastPage.pagination.page >= lastPage.pagination.pageCount) {
         return undefined;
       }