diff --git a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/item/selector/FDSAdminItemSelector.tsx b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/item/selector/FDSAdminItemSelector.tsx
index 91fda4b52bacf2..6ef53339ff9a01 100644
--- a/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/item/selector/FDSAdminItemSelector.tsx
+++ b/modules/apps/frontend-data-set/frontend-data-set-admin-web/src/main/resources/META-INF/resources/item/selector/FDSAdminItemSelector.tsx
@@ -28,6 +28,26 @@ const views = [
 			symbol: 'symbol',
 			title: 'label',
 		},
+		setItemComponentProps: ({item, props}: {item: any; props: any}) => {
+			if (
+				!item.dataSetToDataSetCardsSections.length &&
+				!item.dataSetToDataSetTableSections.length &&
+				!item.dataSetToDataSetListSections.length
+			) {
+
+				return {
+					...props, // we need to avoid item mutation
+					item: {
+						...item,
+						symbol: 'warning',
+						tooltip: 'perico'
+					}
+				}
+
+			}
+
+			return props;
+		},
 	},
 ];
 
@@ -67,7 +87,12 @@ const FDSAdminItemSelector = ({
 			<ClayModal.Body>
 				<FrontendDataSet
 					{...FDS_DEFAULT_PROPS}
-					apiURL={getDataSetResourceURL({})}
+					apiURL={getDataSetResourceURL({
+						params: {
+							nestedFields:
+								'dataSetToDataSetCardsSections, dataSetToDataSetTableSections, dataSetToDataSetListSections',
+						},
+					})}
 					id={`${namespace}FDSAdminItemSelector`}
 					onSelectedItemsChange={(
 						selectedItems: Array<ISelectedItem>
diff --git a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/views/list/List.tsx b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/views/list/List.tsx
index d1cf0f9a803482..146d97748da91c 100644
--- a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/views/list/List.tsx
+++ b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/views/list/List.tsx
@@ -77,10 +77,6 @@ const ListItem = forwardRef<HTMLLIElement, any>(
 			selectionType,
 		} = useContext(FrontendDataSetContext);
 
-		const [viewsContext] = useContext(ViewsContext);
-
-		const activeView: IView = viewsContext.activeView;
-
 		const {description, image, sticker, symbol, title, titleRenderer} =
 			schema;
 
@@ -102,7 +98,6 @@ const ListItem = forwardRef<HTMLLIElement, any>(
 		return (
 			<ClayList.Item
 				{...props}
-				{...(activeView.setItemComponentProps?.({item, props}) ?? {})}
 				ref={ref}
 			>
 				{selectable && (
@@ -194,14 +189,23 @@ const ListItemOptionalDropTarget = ({
 }) => {
 	const {className, dropRef} = useFDSDrop({item});
 
+	const [viewsContext] = useContext(ViewsContext);
+
+	const activeView: IView = viewsContext.activeView;
+
+	const props = {
+		className,
+		item,
+		items,
+		onItemSelectionChange,
+		ref:dropRef,
+		schema,
+	};
+
 	return (
 		<ListItem
-			className={className}
-			item={item}
-			items={items}
-			onItemSelectionChange={onItemSelectionChange}
-			ref={dropRef}
-			schema={schema}
+			{...props}
+			{...(activeView.setItemComponentProps?.({item, props}) ?? {})}
 		/>
 	);
 };