diff --git a/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.js b/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.js
index a2e39269..9c291f00 100644
--- a/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.js
+++ b/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.js
@@ -12,18 +12,19 @@ export const getRestrictedOrgUnits = (orgUnits, orgUnitType, currentUser) => {
     }
 
     // Try the requested orgUnitType first and use currentUser.organisationUnits as fallback
-    const availableOrgUnits = new Set(
-        currentUser[orgUnitType].length > 0
+    const availableOrgUnits =
+        currentUser[orgUnitType]?.length > 0
             ? currentUser[orgUnitType]
             : currentUser.organisationUnits
-    )
+
+    const availableOrgUnitIDs = new Set(availableOrgUnits.map(({ id }) => id))
 
     return orgUnits.filter((unit) => {
-        const isAvailableUnit = availableOrgUnits.has(unit.id)
+        const isAvailableUnit = availableOrgUnitIDs.has(unit.id)
         const hasAvailableAncestor =
             !isAvailableUnit &&
             unit.ancestors.some((ancestor) =>
-                availableOrgUnits.has(ancestor.id)
+                availableOrgUnitIDs.has(ancestor.id)
             )
 
         return isAvailableUnit || hasAvailableAncestor
diff --git a/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.test.js b/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.test.js
new file mode 100644
index 00000000..cf0aa384
--- /dev/null
+++ b/src/components/SearchableOrgUnitTree/AsyncAutoComplete/getRestrictedOrgUnits.test.js
@@ -0,0 +1,72 @@
+import { getRestrictedOrgUnits } from './getRestrictedOrgUnits.js'
+
+describe('getRestrictedOrgUnits', () => {
+    const orgUnits = [
+        { id: 'grapefruit', ancestors: [{ id: 'pomelo' }] },
+        { id: 'tangerine', ancestors: [{ id: 'orange' }, { id: 'pomelo' }] },
+        { id: 'lemon', ancestors: [] },
+    ]
+    const orgUnitType = 'fruit'
+
+    it('returns all organisation units for super users', () => {
+        const currentUser = { authorities: ['ALL'] }
+        const validOrgUnits = getRestrictedOrgUnits(
+            orgUnits,
+            orgUnitType,
+            currentUser
+        )
+        expect(validOrgUnits).toEqual(orgUnits)
+    })
+    it('filters based on specified type when available', () => {
+        const currentUser = {
+            authorities: [],
+            fruit: [{ id: 'grapefruit' }, { id: 'kiwi' }, { id: 'mango' }],
+        }
+        const validOrgUnits = getRestrictedOrgUnits(
+            orgUnits,
+            orgUnitType,
+            currentUser
+        )
+        expect(validOrgUnits.map(({ id }) => id)).toEqual(['grapefruit'])
+    })
+    it('filters based on default organisationUnits specified type is not available', () => {
+        const currentUser = {
+            authorities: [],
+            organisationUnits: [
+                { id: 'tangerine' },
+                { id: 'soursop' },
+                { id: 'apricot' },
+            ],
+        }
+        const validOrgUnits = getRestrictedOrgUnits(
+            orgUnits,
+            orgUnitType,
+            currentUser
+        )
+        expect(validOrgUnits.map(({ id }) => id)).toEqual(['tangerine'])
+    })
+    it('checks ancestors when filtering', () => {
+        const currentUser = {
+            authorities: [],
+            organisationUnits: [{ id: 'pomelo' }],
+        }
+        const validOrgUnits = getRestrictedOrgUnits(
+            orgUnits,
+            orgUnitType,
+            currentUser
+        )
+        expect(validOrgUnits.map(({ id }) => id)).toEqual([
+            'grapefruit',
+            'tangerine',
+        ])
+    })
+    it('returns nothing, if user is not super user and has no org units', () => {
+        const currentUser = { authorities: [], organisationUnits: [] }
+        const validOrgUnits = getRestrictedOrgUnits(
+            orgUnits,
+            orgUnitType,
+            currentUser
+        )
+        expect(validOrgUnits.length).toEqual(0)
+    })
+})