diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js
index 3b9a17b0fd..d003734ee8 100644
--- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js
+++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/RelationInputDataManager.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 import PropTypes from 'prop-types';
 import React, { memo, useMemo } from 'react';
 import { useIntl } from 'react-intl';
@@ -18,6 +19,7 @@ import { connect, select, normalizeSearchResults, diffRelations, normalizeRelati
 export const RelationInputDataManager = ({
   error,
   componentId,
+  componentUid,
   editable,
   description,
   intlLabel,
@@ -64,7 +66,14 @@ export const RelationInputDataManager = ({
       endpoint: endpoints.search,
       pageParams: {
         ...defaultParams,
-        entityId: isCreatingEntry ? undefined : componentId ?? initialData.id,
+        // TODO: fix me cause this sucks
+        entityId: isCreatingEntry
+          ? undefined
+          : componentUid && !componentId
+          ? undefined
+          : !componentUid && !componentId
+          ? initialData.id
+          : componentId,
         pageSize: SEARCH_RESULTS_TO_DISPLAY,
       },
     },
diff --git a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js
index c5d1b07d19..d9c9f0ee2f 100644
--- a/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js
+++ b/packages/core/admin/admin/src/content-manager/components/RelationInputDataManager/utils/select.js
@@ -82,6 +82,7 @@ function useSelect({
 
   return {
     componentId,
+    componentUid,
     queryInfos: {
       ...queryInfos,
       endpoints: {