diff --git a/ee/app/livechat-enterprise/server/lib/Department.js b/ee/app/livechat-enterprise/server/lib/Department.js
index c15ec344df4bd..2661fadf1ca37 100644
--- a/ee/app/livechat-enterprise/server/lib/Department.js
+++ b/ee/app/livechat-enterprise/server/lib/Department.js
@@ -8,16 +8,15 @@ export const findAllDepartmentsAvailable = async (unitId, offset, count, text) =
 	const filterReg = new RegExp(escapeRegExp(text), 'i');
 
 	const cursor = LivechatDepartment.find({
-		$or: [{ ancestors: { $in: [unitId] } }, { ancestors: { $exists: false } }],
+		$or: [{ ancestors: { $in: [[unitId], null, []] } }, { ancestors: { $exists: false } }],
 		...text && { name: filterReg },
 
 	}, { limit: count, offset });
 
 	const departments = await cursor.toArray();
 	const total = await cursor.count();
-	const departmentsFiltered = departments.filter((department) => !department.ancestors?.length);
 
-	return { departments: departmentsFiltered, total };
+	return { departments, total };
 };
 
 export const findAllDepartmentsByUnit = async (unitId, offset, count) => {
diff --git a/ee/client/omnichannel/units/UnitEdit.js b/ee/client/omnichannel/units/UnitEdit.js
index 12146b727dc43..7ae711fc32e33 100644
--- a/ee/client/omnichannel/units/UnitEdit.js
+++ b/ee/client/omnichannel/units/UnitEdit.js
@@ -28,7 +28,7 @@ function UnitEdit({ data, unitId, isNew, unitMonitors, unitDepartments, reload,
 	const [departmentsFilter, setDepartmentsFilter] = useState('');
 
 	const { itemsList: monitorsList, loadMoreItems: loadMoreMonitors } = useMonitorsList(
-		useMemo(() => ({ limit: 50, filter: monitorsFilter }), [monitorsFilter]),
+		useMemo(() => ({ filter: monitorsFilter }), [monitorsFilter]),
 	);
 
 	const { phase: monitorsPhase, items: monitorsItems, itemCount: monitorsTotal } = useRecordList(
@@ -36,7 +36,7 @@ function UnitEdit({ data, unitId, isNew, unitMonitors, unitDepartments, reload,
 	);
 
 	const { itemsList: departmentsList, loadMoreItems: loadMoreDepartments } = useDepartmentsList(
-		useMemo(() => ({ limit: 50, filter: departmentsFilter }), [departmentsFilter]),
+		useMemo(() => ({ filter: departmentsFilter, unitId }), [departmentsFilter, unitId]),
 	);
 
 	const {