diff --git a/apps/settings/src/components/AppNavigationGroupList.vue b/apps/settings/src/components/AppNavigationGroupList.vue
index 5c648a17098..2be7cce2f8b 100644
--- a/apps/settings/src/components/AppNavigationGroupList.vue
+++ b/apps/settings/src/components/AppNavigationGroupList.vue
@@ -42,7 +42,7 @@
 		<NcAppNavigationList class="account-management__group-list"
 			aria-describedby="group-list-desc"
 			data-cy-users-settings-navigation-groups="custom">
-			<GroupListItem v-for="group in userGroups"
+			<GroupListItem v-for="group in filteredGroups"
 				:id="group.id"
 				ref="groupListItems"
 				:key="group.id"
@@ -96,7 +96,11 @@ const selectedGroup = computed(() => route.params?.selectedGroup)
 /** Current active group - URL decoded  */
 const selectedGroupDecoded = computed(() => selectedGroup.value ? decodeURIComponent(selectedGroup.value) : null)
 /** All available groups */
-const groups = computed(() => store.getters.getSortedGroups)
+const groups = computed(() => {
+	return isAdminOrDelegatedAdmin.value
+		? store.getters.getSortedGroups
+		: store.getters.getSubAdminGroups
+})
 /** User groups */
 const { userGroups } = useFormatGroups(groups)
 /** Server settings for current user */
@@ -119,6 +123,14 @@ const loadingGroups = ref(false)
 const offset = ref(0)
 /** Search query for groups */
 const groupsSearchQuery = ref('')
+const filteredGroups = computed(() => {
+	if (isAdminOrDelegatedAdmin.value) {
+		return userGroups.value
+	}
+
+	const substring = groupsSearchQuery.value.toLowerCase()
+	return userGroups.value.filter(group => group.id.toLowerCase().search(substring) !== -1 || group.title.toLowerCase().search(substring) !== -1)
+})
 
 const groupListItems = ref([])
 const lastGroupListItem = computed(() => {
diff --git a/apps/settings/src/composables/useGroupsNavigation.ts b/apps/settings/src/composables/useGroupsNavigation.ts
index 6235088f944..d9f0637843b 100644
--- a/apps/settings/src/composables/useGroupsNavigation.ts
+++ b/apps/settings/src/composables/useGroupsNavigation.ts
@@ -17,14 +17,12 @@ function formatGroupMenu(group?: IGroup) {
 		return null
 	}
 
-	const item = {
+	return {
 		id: group.id,
 		title: group.name,
-		usercount: group.usercount,
-		count: Math.max(0, group.usercount - group.disabled),
+		usercount: group.usercount ?? 0,
+		count: Math.max(0, (group.usercount ?? 0) - (group.disabled ?? 0)),
 	}
-
-	return item
 }
 
 export const useFormatGroups = (groups: Ref<IGroup[]>|ComputedRef<IGroup[]>) => {