diff --git a/changelog/unreleased/bugfix-shares-loading b/changelog/unreleased/bugfix-shares-loading
new file mode 100644
index 00000000000..43300ac4f57
--- /dev/null
+++ b/changelog/unreleased/bugfix-shares-loading
@@ -0,0 +1,18 @@
+Bugfix: Shares loading
+
+We've improved the loading of shares:
+
+* Share loading now happens more globally in the sidebar component instead of in each sidebar panel.
+* Shares won't be loaded for resources without a path anymore, which massively increases performance.
+* Several issues with (re-)share permissions have been fixed.
+* `loadCurrentFileOutgoingShares` and `loadIncomingShares` mutations have been removed. Instead, incoming and outgoing shares are now being loaded via `loadSharesTree()`. This avoids `getShare()` requests from being executed multiple times.
+* Space member loading has been decoupled from shares loading in store. This reduces fetching of space members to a minimum and improves the structure of the code.
+* Reactive loading of share indicators in sidebar details panel has been fixed.
+* Reactive loading of space member count in the spaces overview has been fixed.
+* Loading of indirect shares within spaces has been fixed.
+
+https://github.com/owncloud/web/issues/7506
+https://github.com/owncloud/web/issues/7593
+https://github.com/owncloud/web/issues/7592
+https://github.com/owncloud/web/pull/7580
+https://github.com/owncloud/web/pull/7638
diff --git a/changelog/unreleased/bugfix-shares-tree-loading b/changelog/unreleased/bugfix-shares-tree-loading
deleted file mode 100644
index aa4ce452104..00000000000
--- a/changelog/unreleased/bugfix-shares-tree-loading
+++ /dev/null
@@ -1,13 +0,0 @@
-Bugfix: Shares tree loading
-
-We've improved loading of the shares tree:
-
-* It now happens more globally in the sidebar component instead of in each sidebar panel.
-* Shares won't be loaded for resources without a path anymore.
-
-These changes massively improve the sidebar performance and fix several issues with (re-)share permissions.
-
-https://github.com/owncloud/web/issues/7506
-https://github.com/owncloud/web/issues/7593
-https://github.com/owncloud/web/issues/7592
-https://github.com/owncloud/web/pull/7580
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 7bbfb4c8a2a..5651d44639f 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -209,7 +209,7 @@ export default defineComponent({
     timeout: null
   }),
   computed: {
-    ...mapGetters('Files', ['versions', 'sharesTree', 'sharesTreeLoading']),
+    ...mapGetters('Files', ['versions', 'sharesTree', 'sharesTreeLoading', 'highlightedFile']),
     ...mapGetters(['user', 'configuration']),
 
     file() {
@@ -357,7 +357,7 @@ export default defineComponent({
       handler() {
         // missing early return
         this.sharedItem = null
-        this.shareIndicators = getIndicators(this.file, this.sharesTree)
+        this.shareIndicators = getIndicators(this.highlightedFile, this.sharesTree)
         const sharePathParentOrCurrent = this.getParentSharePath(this.file.path, this.sharesTree)
         if (sharePathParentOrCurrent === null) {
           return
diff --git a/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue b/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
index 8993c417087..3f403fe22f9 100644
--- a/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
@@ -121,11 +121,8 @@ export default defineComponent({
     return { loadImageTask, spaceImage }
   },
   computed: {
-    ...mapGetters('Files', [
-      'highlightedFile',
-      'currentFileOutgoingCollaborators',
-      'currentFileOutgoingLinks'
-    ]),
+    ...mapGetters('Files', ['currentFileOutgoingLinks']),
+    ...mapGetters('runtime/spaces', ['spaceMembers']),
     ...mapGetters(['user']),
     space() {
       return this.displayedItem.value
@@ -188,7 +185,7 @@ export default defineComponent({
     },
     ownerUsernames() {
       const userId = this.user?.id
-      return this.currentFileOutgoingCollaborators
+      return this.spaceMembers
         .filter((share) => share.role.name === spaceRoleManager.name)
         .map((share) => {
           if (share.collaborator.name === userId) {
@@ -207,7 +204,7 @@ export default defineComponent({
       return this.linkShareCount > 0
     },
     memberShareCount() {
-      return this.currentFileOutgoingCollaborators.length
+      return this.spaceMembers.length
     },
     linkShareCount() {
       return this.currentFileOutgoingLinks.length
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index f749615e1c5..1fb20beb6cb 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -88,7 +88,6 @@ import {
 } from 'web-pkg/src/composables'
 
 import { defineComponent } from '@vue/runtime-core'
-import { useGraphClient } from 'web-client/src/composables'
 
 // just a dummy function to trick gettext tools
 const $gettext = (str) => {
@@ -118,7 +117,6 @@ export default defineComponent({
 
   setup() {
     return {
-      ...useGraphClient(),
       hasResharing: useCapabilityFilesSharingResharing(),
       hasShareJail: useCapabilityShareJailEnabled()
     }
@@ -139,6 +137,7 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters('Files', ['currentFileOutgoingCollaborators', 'highlightedFile']),
+    ...mapGetters('runtime/spaces', ['spaceMembers']),
     ...mapGetters(['configuration', 'user', 'capabilities']),
 
     $_announcementWhenCollaboratorAdded() {
@@ -170,6 +169,7 @@ export default defineComponent({
 
   methods: {
     ...mapActions('Files', ['addShare']),
+    ...mapActions('runtime/spaces', ['addSpaceMember']),
 
     async fetchRecipients(query) {
       try {
@@ -211,7 +211,10 @@ export default defineComponent({
             )
           })
 
-          const exists = this.currentFileOutgoingCollaborators.find((existingCollaborator) => {
+          const existingShares = this.resourceIsSpace
+            ? this.spaceMembers
+            : this.currentFileOutgoingCollaborators
+          const exists = existingShares.find((existingCollaborator) => {
             return (
               collaborator.value.shareWith === existingCollaborator.collaborator.name &&
               parseInt(collaborator.value.shareType, 10) === existingCollaborator.shareType
@@ -296,9 +299,9 @@ export default defineComponent({
               path = `/${this.highlightedFile.name}`
             }
 
-            this.addShare({
+            const addMethod = this.resourceIsSpace ? this.addSpaceMember : this.addShare
+            addMethod({
               client: this.$client,
-              graphClient: this.graphClient,
               path,
               $gettext: this.$gettext,
               shareWith: collaborator.value.shareWith,
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index 15996fb8d7d..e1157ca03e0 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -111,7 +111,6 @@ import { SharePermissions, ShareTypes } from 'web-client/src/helpers/share'
 import { useCapabilityFilesSharingResharing } from 'web-pkg/src/composables'
 import { extractDomSelector } from 'web-client/src/helpers/resource'
 import { defineComponent } from '@vue/composition-api'
-import { useGraphClient } from 'web-client/src/composables'
 import * as uuid from 'uuid'
 import { formatDateFromDateTime, formatRelativeDateFromDateTime } from 'web-pkg/src/helpers'
 
@@ -137,7 +136,6 @@ export default defineComponent({
   },
   setup() {
     return {
-      ...useGraphClient(),
       hasResharing: useCapabilityFilesSharingResharing()
     }
   },
@@ -321,6 +319,7 @@ export default defineComponent({
   methods: {
     ...mapActions(['showMessage']),
     ...mapActions('Files', ['changeShare']),
+    ...mapActions('runtime/spaces', ['changeSpaceMember']),
 
     removeShare() {
       this.$emit('onDelete', this.share)
@@ -360,12 +359,10 @@ export default defineComponent({
     saveShareChanges({ role, permissions, expirationDate }) {
       const bitmask = role.hasCustomPermissions
         ? SharePermissions.permissionsToBitmask(permissions)
-        : SharePermissions.permissionsToBitmask(
-            role.permissions(this.hasResharing || this.shareType === ShareTypes.space)
-          )
-      this.changeShare({
+        : SharePermissions.permissionsToBitmask(role.permissions(this.hasResharing || this.isSpace))
+      const changeMethod = this.isSpace ? this.changeSpaceMember : this.changeShare
+      changeMethod({
         client: this.$client,
-        graphClient: this.graphClient,
         share: this.share,
         permissions: bitmask,
         expirationDate: expirationDate || '',
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index 073973137e8..deaf27b7329 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -65,7 +65,6 @@
 </template>
 
 <script lang="ts">
-import { useTask } from 'vue-concurrency'
 import { mapGetters, mapActions, mapState } from 'vuex'
 import { watch, computed, ref, unref } from '@vue/composition-api'
 import {
@@ -78,12 +77,9 @@ import {
 import { createLocationSpaces, isLocationSpacesActive } from '../../../router'
 import { textUtils } from '../../../helpers/textUtils'
 import { getParentPaths } from '../../../helpers/path'
-import { buildSpaceShare } from '../../../helpers/resources'
 import { ShareTypes } from 'web-client/src/helpers/share'
-import { sortSpaceMembers } from '../../../helpers/space'
 import InviteCollaboratorForm from './Collaborators/InviteCollaborator/InviteCollaboratorForm.vue'
 import CollaboratorListItem from './Collaborators/ListItem.vue'
-import { useGraphClient } from 'web-client/src/composables'
 import {
   shareInviteCollaboratorHelp,
   shareInviteCollaboratorHelpCern
@@ -98,7 +94,6 @@ export default {
   setup() {
     const store = useStore()
     const currentSpace = ref(null)
-    const spaceMembers = ref([])
     const currentStorageId = useRouteParam('storageId')
     watch(
       currentStorageId,
@@ -110,40 +105,12 @@ export default {
       { immediate: true }
     )
     const isCurrentSpaceTypeProject = computed(() => unref(currentSpace)?.driveType === 'project')
-
-    const { graphClient } = useGraphClient({ store })
-
-    const loadSpaceMembersTask = useTask(function* (signal, ref) {
-      const promises = []
-      const spaceShares = []
-
-      for (const role of Object.keys(unref(currentSpace).spaceRoles)) {
-        for (const userId of unref(currentSpace).spaceRoles[role]) {
-          promises.push(
-            unref(graphClient)
-              .users.getUser(userId)
-              .then((resolved) => {
-                spaceShares.push(
-                  buildSpaceShare({ ...resolved.data, role }, unref(currentSpace).id)
-                )
-              })
-          )
-        }
-      }
-
-      yield Promise.all(promises).then(() => {
-        spaceMembers.value = sortSpaceMembers(spaceShares)
-      })
-    })
-
     const sharesListCollapsed = !store.getters.configuration.options.sidebar.shares.showAllOnLoad
 
     return {
       currentStorageId,
       currentSpace,
-      spaceMembers,
       isCurrentSpaceTypeProject,
-      loadSpaceMembersTask,
       sharesListCollapsed,
       hasProjectSpaces: useCapabilityProjectSpacesEnabled(),
       hasShareJail: useCapabilityShareJailEnabled(),
@@ -153,6 +120,7 @@ export default {
   computed: {
     ...mapGetters('Files', ['highlightedFile', 'currentFileOutgoingCollaborators']),
     ...mapGetters(['configuration']),
+    ...mapGetters('runtime/spaces', ['spaceMembers']),
     ...mapState('Files', ['incomingShares', 'sharesTree']),
     ...mapState(['user']),
 
@@ -233,8 +201,7 @@ export default {
         if (shares) {
           shares.forEach((share) => {
             if (share.outgoing && this.$_isCollaboratorShare(share)) {
-              share.key = 'indirect-collaborator-' + share.id
-              allShares.push(share)
+              allShares.push({ ...share, key: 'indirect-collaborator-' + share.id })
             }
           })
         }
@@ -271,11 +238,6 @@ export default {
       )
     }
   },
-  mounted() {
-    if (this.showSpaceMembers) {
-      this.loadSpaceMembersTask.perform()
-    }
-  },
   methods: {
     ...mapActions('Files', ['deleteShare']),
     ...mapActions(['createModal', 'hideModal', 'showMessage']),
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
index 38088aff08f..14a6ad6f587 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SharesPanel.vue
@@ -18,7 +18,6 @@ import { computed, defineComponent, unref } from '@vue/composition-api'
 import FileLinks from './FileLinks.vue'
 import FileShares from './FileShares.vue'
 import SpaceMembers from './SpaceMembers.vue'
-import { mapGetters, mapState } from 'vuex'
 import { useStore } from 'web-pkg/src/composables'
 import { useIncomingParentShare } from '../../../composables/parentShare'
 
@@ -41,27 +40,13 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
-    const currentFileOutgoingSharesLoading = computed(
-      () => store.getters['Files/currentFileOutgoingSharesLoading']
-    )
-    const incomingSharesLoading = computed(() => store.getters['Files/incomingSharesLoading'])
-    const sharesTreeLoading = computed(() => store.getters['Files/sharesTreeLoading'])
-    const sharesLoading = computed(
-      () =>
-        unref(currentFileOutgoingSharesLoading) ||
-        unref(incomingSharesLoading) ||
-        unref(sharesTreeLoading)
-    )
+    const sharesLoading = computed(() => store.getters['Files/sharesTreeLoading'])
 
     return {
       ...useIncomingParentShare(),
       sharesLoading
     }
   },
-  computed: {
-    ...mapGetters('Files', ['currentFileOutgoingSharesLoading']),
-    ...mapState('Files', ['incomingSharesLoading', 'sharesTreeLoading'])
-  },
   watch: {
     sharesLoading: {
       handler: function (sharesLoading, old) {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 18283e20db8..536d361789a 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -17,7 +17,7 @@
         class="oc-list oc-list-divider oc-overflow-hidden oc-m-rm"
         :aria-label="$gettext('Space members')"
       >
-        <li v-for="collaborator in members" :key="collaborator.key">
+        <li v-for="collaborator in spaceMembers" :key="collaborator.key">
           <collaborator-list-item
             :share="collaborator"
             :modifiable="isModifiable(collaborator)"
@@ -33,10 +33,9 @@
 import { mapGetters, mapActions, mapState } from 'vuex'
 import CollaboratorListItem from './Collaborators/ListItem.vue'
 import InviteCollaboratorForm from './Collaborators/InviteCollaborator/InviteCollaboratorForm.vue'
-import { spaceRoleManager, ShareTypes } from 'web-client/src/helpers/share'
+import { spaceRoleManager } from 'web-client/src/helpers/share'
 import { createLocationSpaces, isLocationSpacesActive } from '../../../router'
 import { defineComponent } from '@vue/composition-api'
-import { useGraphClient } from 'web-client/src/composables'
 import { shareSpaceAddMemberHelp } from '../../../helpers/contextualHelpers'
 
 export default defineComponent({
@@ -46,13 +45,9 @@ export default defineComponent({
     InviteCollaboratorForm
   },
   inject: ['displayedItem'],
-  setup() {
-    const { graphClient } = useGraphClient()
-    return { graphClient }
-  },
   computed: {
-    ...mapGetters('Files', ['highlightedFile', 'currentFileOutgoingCollaborators']),
     ...mapGetters(['configuration']),
+    ...mapGetters('runtime/spaces', ['spaceMembers']),
     ...mapState(['user']),
 
     helpersEnabled() {
@@ -64,19 +59,14 @@ export default defineComponent({
     space() {
       return this.displayedItem.value
     },
-    members() {
-      return this.currentFileOutgoingCollaborators.filter(
-        (share) => share.shareType === ShareTypes.space.value
-      )
-    },
     hasCollaborators() {
-      return this.members.length > 0
+      return this.spaceMembers.length > 0
     },
     currentUserCanShare() {
       return this.currentUserIsManager
     },
     currentUserIsManager() {
-      const currentUserCollaborator = this.members.find(
+      const currentUserCollaborator = this.spaceMembers.find(
         (collaborator) => collaborator.collaborator.name === this.user.id
       )
 
@@ -84,7 +74,7 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['deleteShare']),
+    ...mapActions('runtime/spaces', ['deleteSpaceMember']),
     ...mapActions(['createModal', 'hideModal', 'showMessage']),
 
     isModifiable(share) {
@@ -97,7 +87,7 @@ export default defineComponent({
       }
 
       // forbid to remove last manager of a space
-      const managers = this.members.filter(
+      const managers = this.spaceMembers.filter(
         (collaborator) => collaborator.role.name === spaceRoleManager.name
       )
       return managers.length > 1
@@ -121,13 +111,7 @@ export default defineComponent({
 
     async $_ocCollaborators_deleteShare(share) {
       try {
-        await this.deleteShare({
-          client: this.$client,
-          graphClient: this.graphClient,
-          share: share,
-          path: this.highlightedFile.path,
-          reloadResource: false
-        })
+        await this.deleteSpaceMember({ client: this.$client, share: share })
         this.showMessage({
           title: this.$gettext('Share was removed successfully')
         })
diff --git a/packages/web-app-files/src/components/SideBar/SideBar.vue b/packages/web-app-files/src/components/SideBar/SideBar.vue
index 0a312d12046..c3f240ec74c 100644
--- a/packages/web-app-files/src/components/SideBar/SideBar.vue
+++ b/packages/web-app-files/src/components/SideBar/SideBar.vue
@@ -40,6 +40,7 @@ import { Panel } from 'web-pkg/src/components/sideBar/'
 import { DavProperties } from 'web-pkg/src/constants'
 import { buildResource } from '../../helpers/resources'
 import {
+  isLocationCommonActive,
   isLocationPublicActive,
   isLocationSharesActive,
   isLocationSpacesActive,
@@ -49,12 +50,13 @@ import { computed, defineComponent } from '@vue/composition-api'
 import {
   useCapabilityShareJailEnabled,
   usePublicLinkPassword,
+  useRouteParam,
   useStore
 } from 'web-pkg/src/composables'
 import { bus } from 'web-pkg/src/instance'
 import { SideBarEventTopics } from '../../composables/sideBar'
 import isEqual from 'lodash-es/isEqual'
-import { useGraphClient } from 'web-client/src/composables'
+import { useActiveLocation } from '../../composables'
 
 export default defineComponent({
   components: { FileInfo, SpaceInfo, SideBar },
@@ -79,7 +81,7 @@ export default defineComponent({
 
   setup() {
     const store = useStore()
-    const { graphClient } = useGraphClient()
+    const currentStorageId = useRouteParam('storageId')
 
     const closeSideBar = () => {
       bus.publish(SideBarEventTopics.close)
@@ -102,13 +104,21 @@ export default defineComponent({
     }
 
     return {
+      isSpacesProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'),
+      isSharedWithMeLocation: useActiveLocation(isLocationSharesActive, 'files-shares-with-me'),
+      isSharedWithOthersLocation: useActiveLocation(
+        isLocationSharesActive,
+        'files-shares-with-others'
+      ),
+      isSharedViaLinkLocation: useActiveLocation(isLocationSharesActive, 'files-shares-via-link'),
+      isFavoritesLocation: useActiveLocation(isLocationCommonActive, 'files-common-favorites'),
       hasShareJail: useCapabilityShareJailEnabled(),
       publicLinkPassword: usePublicLinkPassword({ store }),
       setActiveSideBarPanel,
       closeSideBar,
       destroySideBar,
       focusSideBar,
-      graphClient
+      currentStorageId
     }
   },
 
@@ -124,6 +134,7 @@ export default defineComponent({
   computed: {
     ...mapGetters('Files', ['highlightedFile', 'selectedFiles', 'currentFolder']),
     ...mapGetters(['fileSideBars', 'capabilities']),
+    ...mapGetters('runtime/spaces', ['spaces']),
     ...mapState(['user']),
     availablePanels(): Panel[] {
       const { panels } = this.fileSideBars.reduce(
@@ -205,7 +216,16 @@ export default defineComponent({
         return
       }
 
-      this.fetchFileInfo()
+      // FIXME: isSpacesProjectsLocation resolves "true" within a project?!
+      const isSpacesProjectsLocation = this.isSpacesProjectsLocation && !this.currentStorageId
+      const loadShares =
+        !!oldFile ||
+        isSpacesProjectsLocation ||
+        this.isSharedWithMeLocation ||
+        this.isSharedWithOthersLocation ||
+        this.isSharedViaLinkLocation ||
+        this.isFavoritesLocation
+      this.fetchFileInfo(loadShares)
     },
 
     highlightedFileThumbnail(thumbnail) {
@@ -218,17 +238,13 @@ export default defineComponent({
   },
   async created() {
     if (!this.areMultipleSelected) {
-      await this.fetchFileInfo()
+      await this.fetchFileInfo(false)
     }
   },
   methods: {
-    ...mapActions('Files', [
-      'loadSharesTree',
-      'loadCurrentFileOutgoingShares',
-      'loadIncomingShares'
-    ]),
+    ...mapActions('Files', ['loadSharesTree']),
 
-    async fetchFileInfo() {
+    async fetchFileInfo(loadShares) {
       if (!this.highlightedFile) {
         this.selectedFile = {}
         return
@@ -239,7 +255,9 @@ export default defineComponent({
         isLocationTrashActive(this.$router, 'files-trash-spaces-project') ||
         this.highlightedFileIsSpace
       ) {
-        this.loadShares()
+        if (loadShares) {
+          this.loadShares()
+        }
         this.selectedFile = { ...this.highlightedFile }
         return
       }
@@ -262,7 +280,9 @@ export default defineComponent({
 
         this.selectedFile = buildResource(item)
         this.$set(this.selectedFile, 'thumbnail', this.highlightedFile.thumbnail || null)
-        this.loadShares()
+        if (loadShares) {
+          this.loadShares()
+        }
       } catch (error) {
         this.selectedFile = { ...this.highlightedFile }
         console.error(error)
@@ -271,29 +291,12 @@ export default defineComponent({
     },
 
     loadShares() {
-      this.loadCurrentFileOutgoingShares({
+      this.loadSharesTree({
         client: this.$client,
-        graphClient: this.graphClient,
         path: this.highlightedFile.path,
         storageId: this.highlightedFile.fileId,
-        resource: this.highlightedFile
+        includeRoot: true
       })
-      this.loadIncomingShares({
-        client: this.$client,
-        path: this.highlightedFile.path,
-        $gettext: this.$gettext,
-        storageId: this.highlightedFile.fileId
-      })
-
-      // shares tree is already being loaded for the current folder (except for root)
-      if (!this.currentFolder || this.currentFolder.path === '/') {
-        this.loadSharesTree({
-          client: this.$client,
-          path: this.highlightedFile.path === '' ? '/' : this.highlightedFile.path,
-          $gettext: this.$gettext,
-          storageId: this.highlightedFile.fileId
-        })
-      }
     }
   }
 })
diff --git a/packages/web-app-files/src/mixins/spaces/actions/showDetails.js b/packages/web-app-files/src/mixins/spaces/actions/showDetails.js
index fb841fb985d..9d030bf2174 100644
--- a/packages/web-app-files/src/mixins/spaces/actions/showDetails.js
+++ b/packages/web-app-files/src/mixins/spaces/actions/showDetails.js
@@ -1,8 +1,12 @@
-import { mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import { bus } from 'web-pkg/src/instance'
 import { SideBarEventTopics } from '../../../composables/sideBar'
+import { useGraphClient } from 'web-client/src/composables'
 
 export default {
+  setup() {
+    return { ...useGraphClient() }
+  },
   computed: {
     $_showDetails_items() {
       return [
@@ -20,12 +24,14 @@ export default {
   },
   methods: {
     ...mapMutations('Files', ['SET_FILE_SELECTION']),
+    ...mapActions('runtime/spaces', ['loadSpaceMembers']),
 
     $_showDetails_trigger({ resources }) {
       if (resources.length !== 1) {
         return
       }
 
+      this.loadSpaceMembers({ graphClient: this.graphClient, space: resources[0] })
       this.SET_FILE_SELECTION([resources[0]])
       this.$_showDetails_openSideBar()
     },
diff --git a/packages/web-app-files/src/mixins/spaces/actions/showMembers.js b/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
index 18636809f94..db9d8d3af8c 100644
--- a/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
+++ b/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
@@ -1,8 +1,12 @@
-import { mapMutations } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import { bus } from 'web-pkg/src/instance'
 import { SideBarEventTopics } from '../../../composables/sideBar'
+import { useGraphClient } from 'web-client/src/composables'
 
 export default {
+  setup() {
+    return { ...useGraphClient() }
+  },
   computed: {
     $_showMembers_items() {
       return [
@@ -20,8 +24,10 @@ export default {
   },
   methods: {
     ...mapMutations('Files', ['SET_FILE_SELECTION']),
+    ...mapActions('runtime/spaces', ['loadSpaceMembers']),
 
     $_showMembers_trigger({ resources }) {
+      this.loadSpaceMembers({ graphClient: this.graphClient, space: resources[0] })
       this.SET_FILE_SELECTION(resources)
       bus.publish(SideBarEventTopics.openWithPanel, 'space-share-item')
     }
diff --git a/packages/web-app-files/src/services/folder/spaces/loaderProject.ts b/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
index 12cd3448fe3..a3ef5ef0b77 100644
--- a/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
+++ b/packages/web-app-files/src/services/folder/spaces/loaderProject.ts
@@ -73,7 +73,7 @@ export class FolderLoaderSpacesProject implements FolderLoader {
       yield store.dispatch('Files/loadSharesTree', {
         client: clientService.owncloudSdk,
         path: currentFolder.path,
-        storageId: space.fileId
+        storageId: path ? currentFolder.fileId : space.fileId
       })
 
       for (const file of resources) {
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index b2df13bbd6f..0e207102f2c 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -3,20 +3,13 @@ import { dirname } from 'path'
 import { DavProperties } from 'web-pkg/src/constants'
 
 import { getParentPaths } from '../helpers/path'
-import {
-  buildResource,
-  buildShare,
-  buildCollaboratorShare,
-  buildSpaceShare
-} from '../helpers/resources'
-import { buildSpace } from 'web-client/src/helpers'
+import { buildResource, buildShare, buildCollaboratorShare } from '../helpers/resources'
 import { $gettext, $gettextInterpolate } from '../gettext'
 import { move, copy } from '../helpers/resource'
 import { loadPreview } from 'web-pkg/src/helpers/preview'
 import { avatarUrl } from '../helpers/user'
 import { has } from 'lodash-es'
 import { ShareTypes } from 'web-client/src/helpers/share'
-import { sortSpaceMembers } from '../helpers/space'
 import get from 'lodash-es/get'
 import { ClipboardActions } from '../helpers/clipboardActions'
 import { thumbnailService } from '../services'
@@ -251,149 +244,14 @@ export default {
       value: computeShareTypes(state.currentFileOutgoingShares)
     })
   },
-  loadCurrentFileOutgoingShares(context, { client, graphClient, path, resource, storageId }) {
-    context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', [])
-    context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', null)
-    context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
-
-    if (resource?.type === 'space') {
-      const promises = []
-      const spaceMembers = []
-      const spaceLinks = []
-
-      for (const role of Object.keys(resource.spaceRoles)) {
-        for (const userId of resource.spaceRoles[role]) {
-          promises.push(
-            graphClient.users.getUser(userId).then((resolved) => {
-              spaceMembers.push(buildSpaceShare({ ...resolved.data, role }, resource.id))
-            })
-          )
-        }
-      }
-
-      promises.push(
-        client.shares.getShares(path, { reshares: true, spaceRef: storageId }).then((data) => {
-          for (const element of data) {
-            spaceLinks.push(
-              buildShare(
-                element.shareInfo,
-                context.getters.highlightedFile,
-                !context.rootGetters.isOcis
-              )
-            )
-          }
-        })
-      )
-
-      return Promise.all(promises)
-        .then(() => {
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', [
-            ...sortSpaceMembers(spaceMembers),
-            ...spaceLinks
-          ])
-          context.dispatch('updateCurrentFileShareTypes')
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-        })
-        .catch((error) => {
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', error.message)
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-        })
-    }
-
-    // see https://owncloud.dev/owncloud-sdk/Shares.html
-    client.shares
-      .getShares(path, { reshares: true, spaceRef: storageId })
-      .then((data) => {
-        context.commit(
-          'CURRENT_FILE_OUTGOING_SHARES_SET',
-          data.map((element) => {
-            return buildShare(
-              element.shareInfo,
-              context.getters.highlightedFile,
-              allowSharePermissions(context.rootGetters)
-            )
-          })
-        )
-        context.dispatch('updateCurrentFileShareTypes')
-        context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-      })
-      .catch((error) => {
-        context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', error.message)
-        context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-      })
-  },
-  loadIncomingShares(context, payload) {
-    context.commit('INCOMING_SHARES_LOAD', [])
-    context.commit('INCOMING_SHARES_ERROR', null)
-    context.commit('INCOMING_SHARES_LOADING', true)
-
-    // see https://owncloud.dev/owncloud-sdk/Shares.html
-    const client = payload.client
-    const path = payload.path
-    client.shares
-      .getShares(path, { shared_with_me: true })
-      .then((data) => {
-        context.commit(
-          'INCOMING_SHARES_LOAD',
-          data.map((element) => {
-            return buildCollaboratorShare(
-              element.shareInfo,
-              context.getters.highlightedFile,
-              allowSharePermissions(context.rootGetters)
-            )
-          })
-        )
-        context.commit('INCOMING_SHARES_LOADING', false)
-      })
-      .catch((error) => {
-        context.commit('INCOMING_SHARES_ERROR', error.message)
-        context.commit('INCOMING_SHARES_LOADING', false)
-      })
-  },
   async changeShare(
     { commit, dispatch, getters, rootGetters },
-    { client, graphClient, share, permissions, expirationDate, role }
+    { client, share, permissions, expirationDate, role }
   ) {
     if (!permissions && !role) {
       throw new Error('Nothing changed')
     }
 
-    if (share.shareType === ShareTypes.space.value) {
-      try {
-        await client.shares.shareSpaceWithUser('', share.collaborator.name, share.id, {
-          permissions,
-          role: role.name
-        })
-      } catch (error) {
-        dispatch(
-          'showMessage',
-          { title: $gettext('Error while editing the share.'), status: 'danger' },
-          { root: true }
-        )
-      }
-
-      const spaceShare = buildSpaceShare(
-        {
-          role: role.name,
-          onPremisesSamAccountName: share.collaborator.name,
-          displayName: share.collaborator.displayName
-        },
-        share.id
-      )
-
-      commit('CURRENT_FILE_OUTGOING_SHARES_UPSERT', spaceShare)
-
-      const { data: drive } = await graphClient.drives.getDrive(share.id)
-      const space = buildSpace(drive)
-      commit('UPDATE_RESOURCE_FIELD', {
-        id: share.id,
-        field: 'spaceRoles',
-        value: space.spaceRoles
-      })
-
-      return
-    }
-
     try {
       const updatedShare = await client.shares.updateShare(share.id, {
         role: role.name,
@@ -419,18 +277,7 @@ export default {
   },
   addShare(
     context,
-    {
-      client,
-      graphClient,
-      path,
-      shareWith,
-      shareType,
-      permissions,
-      role,
-      expirationDate,
-      storageId,
-      displayName
-    }
+    { client, path, shareWith, shareType, permissions, role, expirationDate, storageId }
   ) {
     if (shareType === ShareTypes.group.value) {
       client.shares
@@ -466,49 +313,6 @@ export default {
       return
     }
 
-    if (shareType === ShareTypes.space.value) {
-      client.shares
-        .shareSpaceWithUser(path, shareWith, storageId, {
-          permissions,
-          role: role.name
-        })
-        .then(() => {
-          const shareObj = {
-            role: role.name,
-            onPremisesSamAccountName: shareWith,
-            displayName
-          }
-
-          context.commit(
-            'CURRENT_FILE_OUTGOING_SHARES_UPSERT',
-            buildSpaceShare(shareObj, storageId)
-          )
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
-
-          return graphClient.drives.getDrive(storageId).then((response) => {
-            const space = buildSpace(response.data)
-            context.commit('UPDATE_RESOURCE_FIELD', {
-              id: storageId,
-              field: 'spaceRoles',
-              value: space.spaceRoles
-            })
-            context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-          })
-        })
-        .catch((e) => {
-          context.dispatch(
-            'showMessage',
-            {
-              title: $gettext('Error while sharing.'),
-              desc: e,
-              status: 'danger'
-            },
-            { root: true }
-          )
-        })
-      return
-    }
-
     const remoteShare = shareType === ShareTypes.remote.value
     client.shares
       .shareFileWithUser(path, shareWith, {
@@ -542,31 +346,11 @@ export default {
         )
       })
   },
-  deleteShare(context, { client, graphClient, share, path, storageId, reloadResource = true }) {
-    const additionalParams: any = {}
-    if (share.shareType === ShareTypes.space.value) {
-      additionalParams.shareWith = share.collaborator.name
-    }
-
-    return client.shares.deleteShare(share.id, additionalParams).then(() => {
+  deleteShare(context, { client, share, path, storageId }) {
+    return client.shares.deleteShare(share.id, {} as any).then(() => {
       context.commit('CURRENT_FILE_OUTGOING_SHARES_REMOVE', share)
-
-      if (share.shareType !== ShareTypes.space.value) {
-        context.dispatch('updateCurrentFileShareTypes')
-        context.dispatch('loadIndicators', { client, currentFolder: path, storageId })
-      } else if (reloadResource) {
-        context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', true)
-
-        return graphClient.drives.getDrive(share.id).then((response) => {
-          const space = buildSpace(response.data)
-          context.commit('UPDATE_RESOURCE_FIELD', {
-            id: share.id,
-            field: 'spaceRoles',
-            value: space.spaceRoles
-          })
-          context.commit('CURRENT_FILE_OUTGOING_SHARES_LOADING', false)
-        })
-      }
+      context.dispatch('updateCurrentFileShareTypes')
+      context.dispatch('loadIndicators', { client, currentFolder: path, storageId })
     })
   },
   /**
@@ -581,72 +365,87 @@ export default {
    * This will add new entries into the shares tree and will
    * not remove unrelated existing ones.
    */
-  loadSharesTree(context, { client, path, storageId }) {
+  loadSharesTree(context, { client, path, storageId, includeRoot = false }) {
     context.commit('SHARESTREE_ERROR', null)
     // prune shares tree cache for all unrelated paths, keeping only
     // existing relevant parent entries
     context.dispatch('pruneSharesTreeOutsidePath', path)
+    context.commit('INCOMING_SHARES_LOAD', [])
+    context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', [])
+    context.commit('SHARESTREE_LOADING', true)
 
-    const parentPaths = getParentPaths(path, true)
+    const parentPaths = path === '/' && includeRoot ? ['/'] : getParentPaths(path, true)
     const sharesTree = {}
+    const outgoingShares = []
+    const incomingShares = []
 
-    context.commit('SHARESTREE_LOADING', true)
     const shareQueriesQueue = new PQueue({ concurrency: 2 })
     const shareQueriesPromises = []
+    const { highlightedFile } = context.getters
+
+    const getShares = (subPath, indirect, options, outgoing) => {
+      const buildMethod = outgoing ? buildShare : buildCollaboratorShare
+      const resource = indirect || !highlightedFile ? { type: 'folder' } : highlightedFile
+      const arr = outgoing ? outgoingShares : incomingShares
+      const permissions = allowSharePermissions(context.rootGetters)
+      if (!sharesTree[subPath]) {
+        sharesTree[subPath] = []
+      }
+      return client.shares
+        .getShares(subPath, options)
+        .then((data) => {
+          data.forEach((element) => {
+            const share = {
+              ...buildMethod(element.shareInfo, resource, permissions),
+              outgoing,
+              indirect
+            }
+            sharesTree[subPath].push(share)
+            if (!indirect) {
+              arr.push(share)
+            }
+          })
+        })
+        .catch((error) => {
+          console.error('SHARESTREE_ERROR', error)
+          context.commit('SHARESTREE_ERROR', error.message)
+          context.commit('SHARESTREE_LOADING', false)
+        })
+    }
+
+    if (!path) {
+      // space shares
+      shareQueriesPromises.push(
+        getShares(path, false, { reshares: true, spaceRef: storageId }, true)
+      )
+    }
+
     parentPaths.forEach((queryPath) => {
-      // skip already cached paths
+      const indirect = path !== queryPath
+      // FIXME: We need the storageId of each parent resource here
+      const spaceRef = indirect ? null : storageId
+      // no need to fetch cached paths again, only adjust the "indirect" state
       if (context.getters.sharesTree[queryPath]) {
-        return Promise.resolve()
+        sharesTree[queryPath] = context.getters.sharesTree[queryPath].map((s) => {
+          if (!indirect) {
+            const arr = s.outgoing ? outgoingShares : incomingShares
+            arr.push({ ...s, indirect })
+          }
+          return { ...s, indirect }
+        })
+        return
       }
-      sharesTree[queryPath] = []
+
       // query the outgoing share information for each of the parent paths
       shareQueriesPromises.push(
         shareQueriesQueue.add(() =>
-          client.shares
-            .getShares(queryPath, { reshares: true, spaceRef: storageId })
-            .then((data) => {
-              data.forEach((element) => {
-                sharesTree[queryPath].push({
-                  ...buildShare(
-                    element.shareInfo,
-                    { type: 'folder' },
-                    allowSharePermissions(context.rootGetters)
-                  ),
-                  outgoing: true,
-                  indirect: true
-                })
-              })
-            })
-            .catch((error) => {
-              console.error('SHARESTREE_ERROR', error)
-              context.commit('SHARESTREE_ERROR', error.message)
-              context.commit('SHARESTREE_LOADING', false)
-            })
+          getShares(queryPath, indirect, { reshares: true, spaceRef }, true)
         )
       )
       // query the incoming share information for each of the parent paths
       shareQueriesPromises.push(
         shareQueriesQueue.add(() =>
-          client.shares
-            .getShares(queryPath, { shared_with_me: true, spaceRef: storageId })
-            .then((data) => {
-              data.forEach((element) => {
-                sharesTree[queryPath].push({
-                  ...buildCollaboratorShare(
-                    element.shareInfo,
-                    { type: 'folder' },
-                    allowSharePermissions(context.rootGetters)
-                  ),
-                  incoming: true,
-                  indirect: true
-                })
-              })
-            })
-            .catch((error) => {
-              console.error('SHARESTREE_ERROR', error)
-              context.commit('SHARESTREE_ERROR', error.message)
-              context.commit('SHARESTREE_LOADING', false)
-            })
+          getShares(queryPath, indirect, { shared_with_me: true, spaceRef }, false)
         )
       )
     })
@@ -654,6 +453,8 @@ export default {
     return Promise.all(shareQueriesPromises).then(() => {
       context.commit('SHARESTREE_ADD', sharesTree)
       context.commit('SHARESTREE_LOADING', false)
+      context.commit('CURRENT_FILE_OUTGOING_SHARES_SET', outgoingShares)
+      context.commit('INCOMING_SHARES_LOAD', incomingShares)
     })
   },
   async loadVersions(context, { client, fileId }) {
@@ -698,14 +499,11 @@ export default {
     })
   },
   removeLink(context, { share, client, path, storageId }) {
-    client.shares
-      .deleteShare(share.id)
-      .then(() => {
-        context.commit('CURRENT_FILE_OUTGOING_SHARES_REMOVE', share)
-        context.dispatch('updateCurrentFileShareTypes')
-        context.dispatch('loadIndicators', { client, currentFolder: path, storageId })
-      })
-      .catch((e) => context.commit('CURRENT_FILE_OUTGOING_SHARES_ERROR', e.message))
+    client.shares.deleteShare(share.id).then(() => {
+      context.commit('CURRENT_FILE_OUTGOING_SHARES_REMOVE', share)
+      context.dispatch('updateCurrentFileShareTypes')
+      context.dispatch('loadIndicators', { client, currentFolder: path, storageId })
+    })
   },
 
   pushResourcesToDeleteList({ commit }, resources) {
diff --git a/packages/web-app-files/src/store/getters.ts b/packages/web-app-files/src/store/getters.ts
index d2c5a5c9a3d..b061ea3008f 100644
--- a/packages/web-app-files/src/store/getters.ts
+++ b/packages/web-app-files/src/store/getters.ts
@@ -49,9 +49,6 @@ export default {
       return ShareTypes.containsAnyValue(ShareTypes.unauthenticated, [share.shareType])
     })
   },
-  currentFileOutgoingSharesLoading: (state) => {
-    return state.currentFileOutgoingSharesLoading
-  },
   sharesTree: (state) => state.sharesTree,
   sharesTreeLoading: (state) => state.sharesTreeLoading,
   quota: (state) => {
diff --git a/packages/web-app-files/src/store/mutations.ts b/packages/web-app-files/src/store/mutations.ts
index 06d5171ca26..03ef1f414c7 100644
--- a/packages/web-app-files/src/store/mutations.ts
+++ b/packages/web-app-files/src/store/mutations.ts
@@ -3,7 +3,6 @@ import pickBy from 'lodash-es/pickBy'
 import { set, has } from 'lodash-es'
 import { getIndicators } from '../helpers/statusIndicators'
 import { renameResource } from '../helpers/resources'
-import { ShareTypes } from 'web-client/src/helpers/share'
 
 export default {
   LOAD_FILES(state, { currentFolder, files }) {
@@ -101,27 +100,14 @@ export default {
     state.currentFileOutgoingShares = shares
   },
   CURRENT_FILE_OUTGOING_SHARES_REMOVE(state, share) {
-    if (share.shareType === ShareTypes.space.value) {
-      state.currentFileOutgoingShares = state.currentFileOutgoingShares.filter(
-        (s) => share.id === s.id && share.collaborator.name !== s.collaborator.name
-      )
-      return
-    }
     state.currentFileOutgoingShares = state.currentFileOutgoingShares.filter(
       (s) => share.id !== s.id
     )
   },
   CURRENT_FILE_OUTGOING_SHARES_UPSERT(state, share) {
-    let fileIndex
-    if (share.shareType === ShareTypes.space.value) {
-      fileIndex = state.currentFileOutgoingShares.findIndex((s) => {
-        return share.id === s.id && share.collaborator.name === s.collaborator.name
-      })
-    } else {
-      fileIndex = state.currentFileOutgoingShares.findIndex((s) => {
-        return s.id === share.id
-      })
-    }
+    const fileIndex = state.currentFileOutgoingShares.findIndex((s) => {
+      return s.id === share.id
+    })
 
     if (fileIndex >= 0) {
       Vue.set(state.currentFileOutgoingShares, fileIndex, share)
@@ -130,23 +116,9 @@ export default {
       state.currentFileOutgoingShares.push(share)
     }
   },
-  CURRENT_FILE_OUTGOING_SHARES_ERROR(state, error) {
-    state.currentFileOutgoingShares = []
-    state.currentFileOutgoingSharesError = error
-  },
-  CURRENT_FILE_OUTGOING_SHARES_LOADING(state, loading) {
-    state.currentFileOutgoingSharesLoading = loading
-  },
   INCOMING_SHARES_LOAD(state, shares) {
     state.incomingShares = shares
   },
-  INCOMING_SHARES_ERROR(state, error) {
-    state.incomingShares = []
-    state.incomingSharesError = error
-  },
-  INCOMING_SHARES_LOADING(state, loading) {
-    state.incomingSharesLoading = loading
-  },
   SHARESTREE_PRUNE_OUTSIDE_PATH(state, pathToKeep) {
     if (pathToKeep !== '' && pathToKeep !== '/') {
       // clear all children unrelated to the given path
diff --git a/packages/web-app-files/src/store/state.ts b/packages/web-app-files/src/store/state.ts
index 72d2a955c3e..54988692339 100644
--- a/packages/web-app-files/src/store/state.ts
+++ b/packages/web-app-files/src/store/state.ts
@@ -12,15 +12,11 @@ export default {
    * Outgoing shares and links from currently highlighted element
    */
   currentFileOutgoingShares: [],
-  currentFileOutgoingSharesError: null,
-  currentFileOutgoingSharesLoading: false,
 
   /**
    * Incoming shares from currently highlighted element
    */
   incomingShares: [],
-  incomingSharesError: null,
-  incomingSharesLoading: false,
 
   /**
    * Shares from parent folders
diff --git a/packages/web-app-files/src/views/spaces/Project.vue b/packages/web-app-files/src/views/spaces/Project.vue
index fb6d154377e..c50d801bb57 100644
--- a/packages/web-app-files/src/views/spaces/Project.vue
+++ b/packages/web-app-files/src/views/spaces/Project.vue
@@ -168,6 +168,7 @@ import { buildWebDavSpacesPath } from 'web-client/src/helpers'
 import SideBar from '../../components/SideBar/SideBar.vue'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import { SideBarEventTopics } from '../../composables/sideBar'
+import { useGraphClient } from 'web-client/src/composables'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -200,6 +201,7 @@ export default defineComponent({
 
     return {
       ...useResourcesViewDefaults(),
+      ...useGraphClient(),
       resourceTargetLocation: createLocationSpaces('files-spaces-project'),
       space,
       accessToken: useAccessToken({ store })
@@ -224,6 +226,7 @@ export default defineComponent({
       'totalFilesSize'
     ]),
     ...mapGetters(['user', 'configuration']),
+    ...mapGetters('runtime/spaces', ['spaceMembers']),
     ...mapState(['app']),
 
     breadcrumbs() {
@@ -259,7 +262,7 @@ export default defineComponent({
       return !this.configuration?.options?.disablePreviews
     },
     memberCount() {
-      return this.space.spaceMemberIds.length
+      return this.spaceMembers.length
     },
     memberCountString() {
       const translated = this.$ngettext('%{count} member', '%{count} members', this.memberCount)
@@ -356,6 +359,7 @@ export default defineComponent({
   },
   async mounted() {
     await this.loadResourcesTask.perform(this, false, this.$route.params.item || '')
+    this.loadSpaceMembers({ graphClient: this.graphClient, space: this.space })
 
     document.title = `${this.$route.meta.title} - ${this.space.name} - ${this.configuration.currentTheme.general.name}`
     this.$route.params.name = this.space.name
@@ -376,7 +380,8 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions('Files', ['loadIndicators', 'loadPreview', 'loadCurrentFileOutgoingShares']),
+    ...mapActions('Files', ['loadIndicators', 'loadPreview']),
+    ...mapActions('runtime/spaces', ['loadSpaceMembers']),
     ...mapMutations('runtime/spaces', ['UPSERT_SPACE']),
     ...mapMutations('Files', [
       'SET_CURRENT_FOLDER',
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index 3b7b0c2938d..3c65e5bd8c4 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -271,6 +271,7 @@ export default defineComponent({
   },
   methods: {
     ...mapActions(['showMessage']),
+    ...mapActions('runtime/spaces', ['loadSpaceMembers']),
     ...mapMutations('Files', [
       'SET_CURRENT_FOLDER',
       'LOAD_FILES',
@@ -295,6 +296,7 @@ export default defineComponent({
     },
 
     openSidebarSharePanel(space) {
+      this.loadSpaceMembers({ graphClient: this.graphClient, space })
       this.SET_FILE_SELECTION([space])
       bus.publish(SideBarEventTopics.openWithPanel, 'space-share-item')
     },
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Details/SpaceDetails.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Details/SpaceDetails.spec.js
index c2411bea71d..e864c2b08da 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Details/SpaceDetails.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Details/SpaceDetails.spec.js
@@ -81,6 +81,17 @@ function createWrapper(spaceResource) {
         }
       },
       modules: {
+        runtime: {
+          namespaced: true,
+          modules: {
+            spaces: {
+              namespaced: true,
+              getters: {
+                spaceMembers: () => [spaceShare]
+              }
+            }
+          }
+        },
         Files: {
           namespaced: true,
           state: {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
index d7629ae5143..8e01056ac96 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -59,9 +59,9 @@ describe('InviteCollaboratorForm', () => {
       expect(spyTriggerUpload).toHaveBeenCalledTimes(0)
     })
     it.each([
-      { storageId: undefined, highlightedFile: folderMock },
-      { storageId: undefined, highlightedFile: spaceMock },
-      { storageId: 1, highlightedFile: folderMock }
+      { storageId: undefined, highlightedFile: folderMock, addMethod: 'addShare' },
+      { storageId: undefined, highlightedFile: spaceMock, addMethod: 'addSpaceMember' },
+      { storageId: 1, highlightedFile: folderMock, addMethod: 'addShare' }
     ])('calls the "addShare" action', async (dataSet) => {
       const selectedCollaborators = [
         { shareWith: 'marie', value: { shareType: ShareTypes.user.value }, label: 'label' }
@@ -71,7 +71,7 @@ describe('InviteCollaboratorForm', () => {
         storageId: dataSet.storageId,
         highlightedFile: dataSet.highlightedFile
       })
-      const addShareSpy = jest.spyOn(wrapper.vm, 'addShare')
+      const addShareSpy = jest.spyOn(wrapper.vm, dataSet.addMethod)
       await wrapper.vm.share()
       expect(addShareSpy).toBeCalled()
     })
@@ -118,6 +118,12 @@ function getWrapper({ selectedCollaborators = [], storageId, highlightedFile = f
               getters: {
                 accessToken: () => 'GFwHKXdsMgoFwt'
               }
+            },
+            spaces: {
+              namespaced: true,
+              actions: {
+                addSpaceMember: jest.fn()
+              }
             }
           }
         }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
index ff91cf1a438..1ef9cfe60a4 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
@@ -17,8 +17,7 @@ localVue.use(GetTextPlugin, {
 
 const mapActions = {
   addLink: jest.fn(),
-  loadSharesTree: jest.fn(),
-  loadCurrentFileOutgoingShares: jest.fn()
+  loadSharesTree: jest.fn()
 }
 
 const mapMutations = {
@@ -142,7 +141,6 @@ describe('FileLinks', () => {
       isFolder: false,
       isReceivedShare: jest.fn()
     },
-    currentFileOutgoingSharesLoading = false,
     sharesTreeLoading = false,
     expireDate = {
       enabled: true,
@@ -194,7 +192,6 @@ describe('FileLinks', () => {
             currentFileOutgoingLinks: function () {
               return links
             },
-            currentFileOutgoingSharesLoading: jest.fn(() => currentFileOutgoingSharesLoading),
             sharesTreeLoading: jest.fn(() => sharesTreeLoading)
           },
           actions: mapActions,
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index c8a5a54eea7..6301b662045 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -127,18 +127,20 @@ describe('FileShares', () => {
           ]
         }
       })
-      const wrapper = getShallowMountedWrapper({ user, spaces: [spaceMock] })
-
-      await wrapper.vm.loadSpaceMembersTask.last
-      expect(wrapper.vm.spaceMembers.length).toBe(1)
+      const wrapper = getShallowMountedWrapper({
+        user,
+        spaces: [spaceMock],
+        spaceMembers: [{ id: 1 }]
+      })
       expect(wrapper.find('#space-collaborators-list').exists()).toBeTruthy()
     })
     it('does not load space members if no space is given', () => {
       const wrapper = getShallowMountedWrapper({
-        user
+        user,
+        spaceMembers: [{ id: 1 }]
       })
 
-      expect(wrapper.vm.spaceMembers.length).toBe(0)
+      expect(wrapper.find('#space-collaborators-list').exists()).toBeFalsy()
     })
   })
 })
@@ -183,7 +185,8 @@ const storeOptions = (data) => {
     outgoingCollaborators = [],
     incomingCollaborators = [],
     canShare = true,
-    spaces = []
+    spaces = [],
+    spaceMembers = []
   } = data
   return {
     actions: {
@@ -206,12 +209,9 @@ const storeOptions = (data) => {
             return getResource({ filename: 'testfile', extension: 'jpg', type: 'file', canShare })
           },
           currentFileOutgoingCollaborators: () => outgoingCollaborators,
-          currentFileOutgoingSharesLoading: () => false,
           sharesTreeLoading: () => false
         },
         actions: {
-          loadCurrentFileOutgoingShares: jest.fn(),
-          loadIncomingShares: jest.fn(),
           loadSharesTree: jest.fn(),
           deleteShare: jest.fn()
         },
@@ -224,17 +224,19 @@ const storeOptions = (data) => {
       },
       runtime: {
         namespaced: true,
-        state: {
-          spaces: {
-            spaces
-          }
-        },
         modules: {
           auth: {
             namespaced: true,
             getters: {
               accessToken: () => 'GFwHKXdsMgoFwt'
             }
+          },
+          spaces: {
+            namespaced: true,
+            state: { spaces },
+            getters: {
+              spaceMembers: () => spaceMembers
+            }
           }
         }
       }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
index 330fdad6166..7f9d94fa6e2 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
@@ -40,7 +40,8 @@ describe('SharesPanel', () => {
       localVue,
       provide: {
         activePanel: null,
-        displayedItem: {}
+        displayedItem: {},
+        spaceMembers: { value: [] }
       },
       store: new Vuex.Store({
         modules: {
@@ -52,8 +53,7 @@ describe('SharesPanel', () => {
             getters: {
               highlightedFile: (state) => {
                 return state.highlightedFile
-              },
-              currentFileOutgoingSharesLoading: jest.fn()
+              }
             },
             mutations: {
               SET_HIGHLIGHTED_FILE(state, file) {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
index 7c05dc01816..654b31a9f96 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
@@ -28,7 +28,7 @@ const spaceMock = {
   }
 }
 
-const outgoingShares = [
+const spaceMembers = [
   {
     id: '1',
     shareType: ShareTypes.space.value,
@@ -78,7 +78,7 @@ describe('SpaceMembers', () => {
     it('initially renders add people dialog', () => {
       const wrapper = getShallowMountedWrapper({
         user,
-        outgoingCollaborators: [outgoingShares[0]]
+        spaceMembers: [spaceMembers[0]]
       })
       expect(wrapper).toMatchSnapshot()
     })
@@ -88,7 +88,7 @@ describe('SpaceMembers', () => {
     it('other shares are listed, but creating/editing shares is not possible', () => {
       const wrapper = getShallowMountedWrapper({
         user,
-        outgoingCollaborators: [outgoingShares[1]]
+        spaceMembers: [spaceMembers[1]]
       })
       expect(wrapper).toMatchSnapshot()
     })
@@ -98,14 +98,14 @@ describe('SpaceMembers', () => {
     it('allows role edit of the current user if another user is manager', () => {
       const wrapper = getShallowMountedWrapper({
         user,
-        outgoingCollaborators: outgoingShares
+        spaceMembers
       })
       expect(wrapper).toMatchSnapshot()
     })
     it('does not allow role edit of the current user if they are the only manager', () => {
       const wrapper = getShallowMountedWrapper({
         user,
-        outgoingCollaborators: [outgoingShares[0], outgoingShares[1]]
+        spaceMembers: [spaceMembers[0], spaceMembers[1]]
       })
       expect(wrapper).toMatchSnapshot()
     })
@@ -115,7 +115,7 @@ describe('SpaceMembers', () => {
     it('reacts on delete events by collaborator list items', async () => {
       const wrapper = getMountedWrapper({
         user,
-        outgoingCollaborators: outgoingShares
+        spaceMembers
       })
 
       const spyOnCollaboratorDeleteTrigger = jest.spyOn(
@@ -123,7 +123,7 @@ describe('SpaceMembers', () => {
         '$_ocCollaborators_deleteShare_trigger'
       )
       wrapper
-        .find(`div[data-testid="collaborator-user-item-${outgoingShares[0].collaborator.name}"]`)
+        .find(`div[data-testid="collaborator-user-item-${spaceMembers[0].collaborator.name}"]`)
         .vm.$emit('onDelete')
       await wrapper.vm.$nextTick()
       expect(spyOnCollaboratorDeleteTrigger).toHaveBeenCalledTimes(1)
@@ -132,7 +132,7 @@ describe('SpaceMembers', () => {
 })
 
 const storeOptions = (data, isInLoadingState) => {
-  const { user, outgoingCollaborators = [] } = data
+  const { user, spaceMembers = [] } = data
 
   return {
     actions: {
@@ -148,12 +148,9 @@ const storeOptions = (data, isInLoadingState) => {
         namespaced: true,
         getters: {
           highlightedFile: () => spaceMock,
-          currentFileOutgoingCollaborators: () => outgoingCollaborators,
-          currentFileOutgoingSharesLoading: () => isInLoadingState,
           sharesTreeLoading: () => false
         },
         actions: {
-          loadCurrentFileOutgoingShares: jest.fn(),
           deleteShare: jest.fn()
         },
         mutations: {
@@ -161,6 +158,17 @@ const storeOptions = (data, isInLoadingState) => {
             state.highlightedFile = spaceMock
           }
         }
+      },
+      runtime: {
+        namespaced: true,
+        modules: {
+          spaces: {
+            namespaced: true,
+            getters: {
+              spaceMembers: () => spaceMembers
+            }
+          }
+        }
       }
     },
     getters: {
@@ -196,7 +204,7 @@ const storeOptions = (data, isInLoadingState) => {
 }
 
 function getShallowMountedWrapper(data, loading = false) {
-  return shallowMount(getComponent(loading), {
+  return shallowMount(SpaceMembers, {
     localVue,
     store: createStore(data, loading),
     stubs: {
@@ -213,7 +221,7 @@ function getShallowMountedWrapper(data, loading = false) {
 }
 
 function getMountedWrapper(data, loading = false) {
-  return mount(getComponent(loading), {
+  return mount(SpaceMembers, {
     localVue,
     store: createStore(data, loading),
     stubs: {
@@ -246,16 +254,3 @@ function getMountedWrapper(data, loading = false) {
 function createStore(data, loading) {
   return new Vuex.Store(storeOptions(data, loading))
 }
-
-function getComponent(loading) {
-  return {
-    ...SpaceMembers,
-    setup: () => ({
-      graphClient: {},
-      loadSharesTask: {
-        isRunning: loading,
-        perform: jest.fn()
-      }
-    })
-  }
-}
diff --git a/packages/web-app-files/tests/unit/store/actions.spec.js b/packages/web-app-files/tests/unit/store/actions.spec.js
index 422b8e9a512..165201d9fec 100644
--- a/packages/web-app-files/tests/unit/store/actions.spec.js
+++ b/packages/web-app-files/tests/unit/store/actions.spec.js
@@ -1,6 +1,5 @@
 import actions from '../../../src/store/actions'
 import { spaceRoleManager, ShareTypes } from 'web-client/src/helpers/share'
-import { buildSpace } from 'web-client/src/helpers'
 
 const stateMock = {
   commit: jest.fn(),
@@ -36,123 +35,60 @@ const clientMock = {
   }
 }
 
-const graphClientMock = {
-  drives: {
-    getDrive: () => {
-      return Promise.resolve({ data: spaceMock })
-    }
-  },
-  users: {
-    getUser: () => {
-      return Promise.resolve({})
-    }
-  }
-}
 const shareMock = {
   id: '1',
   shareType: ShareTypes.user.value
 }
 
-const spaceMock = buildSpace({
-  type: 'space',
-  name: ' space',
-  id: '1',
-  root: { permissions: [{ roles: ['manager'], grantedTo: [{ user: { id: 1 } }] }] }
-})
-
-const spaceShareMock = {
-  id: '1',
-  shareType: ShareTypes.space.value,
-  collaborator: {
-    onPremisesSamAccountName: 'Alice',
-    displayName: 'alice'
-  },
-  role: {
-    name: spaceRoleManager.name
-  }
-}
-
 describe('vuex store actions', () => {
   afterEach(() => {
     jest.clearAllMocks()
   })
 
-  describe('loadCurrentFileOutgoingShares', () => {
-    it.each([
-      { space: spaceMock, expectedCommitCalls: 5, expectedDispatchCalls: 1 },
-      { space: null, expectedCommitCalls: 5, expectedDispatchCalls: 1 }
-    ])('succeeds using action %s', async (dataSet) => {
-      const commitSpy = jest.spyOn(stateMock, 'commit')
-      const dispatchSpy = jest.spyOn(stateMock, 'dispatch')
-
-      await actions.loadCurrentFileOutgoingShares(stateMock, {
-        client: clientMock,
-        graphClient: graphClientMock,
-        path: 'path',
-        resource: dataSet.space
-      })
-
-      expect(commitSpy).toBeCalledTimes(dataSet.expectedCommitCalls)
-      expect(dispatchSpy).toBeCalledTimes(dataSet.expectedDispatchCalls)
-    })
-  })
-
   describe('changeShare', () => {
-    it.each([
-      { share: spaceShareMock, expectedCommitCalls: 2 },
-      { share: shareMock, expectedCommitCalls: 1 }
-    ])('succeeds using action %s', async (dataSet) => {
+    it('succeeds using action %s', async () => {
       const commitSpy = jest.spyOn(stateMock, 'commit')
 
       await actions.changeShare(stateMock, {
         client: clientMock,
-        graphClient: graphClientMock,
-        share: dataSet.share,
+        share: shareMock,
         permissions: spaceRoleManager.bitmask(false),
         role: spaceRoleManager,
         expirationDate: null
       })
 
-      expect(commitSpy).toBeCalledTimes(dataSet.expectedCommitCalls)
+      expect(commitSpy).toBeCalledTimes(1)
     })
   })
 
   describe('addShare', () => {
-    it.each([
-      { shareType: spaceShareMock.shareType, storageId: spaceMock.id, expectedCommitCalls: 2 },
-      { shareType: shareMock.shareType, storageId: null, expectedCommitCalls: 1 }
-    ])('succeeds using action %s', async (dataSet) => {
+    it('succeeds using action %s', async () => {
       const commitSpy = jest.spyOn(stateMock, 'commit')
 
       await actions.addShare(stateMock, {
         client: clientMock,
-        graphClient: graphClientMock,
-        shareType: dataSet.shareType,
-        storageId: dataSet.storageId,
+        shareType: shareMock.shareType,
+        storageId: null,
         permissions: spaceRoleManager.bitmask(false),
         role: spaceRoleManager,
         expirationDate: null
       })
 
-      expect(commitSpy).toBeCalledTimes(dataSet.expectedCommitCalls)
+      expect(commitSpy).toBeCalledTimes(1)
     })
   })
 
   describe('deleteShare', () => {
-    it.each([
-      { share: spaceShareMock, storageId: spaceMock.id, expectedCommitCalls: 4 },
-      { share: shareMock, storageId: null, expectedCommitCalls: 1 }
-    ])('succeeds using action %s', async (dataSet) => {
+    it('succeeds using action %s', async () => {
       const commitSpy = jest.spyOn(stateMock, 'commit')
 
       await actions.deleteShare(stateMock, {
         client: clientMock,
-        graphClient: graphClientMock,
-        share: dataSet.share,
+        share: shareMock,
         resource: {}
       })
 
-      expect(commitSpy).toBeCalledTimes(dataSet.expectedCommitCalls)
+      expect(commitSpy).toBeCalledTimes(1)
     })
   })
 })
diff --git a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
index e5def869a4c..79e2e45bd70 100644
--- a/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
+++ b/packages/web-app-files/tests/unit/views/spaces/Project.spec.js
@@ -284,7 +284,6 @@ function getMountedWrapper(spaceResources = [], spaceItem = null, imageContent =
           },
           actions: {
             loadIndicators: jest.fn(),
-            loadCurrentFileOutgoingShares: jest.fn(),
             loadSharesTree: jest.fn()
           },
           getters: {
@@ -308,6 +307,12 @@ function getMountedWrapper(spaceResources = [], spaceItem = null, imageContent =
             },
             spaces: {
               namespaced: true,
+              getters: {
+                spaceMembers: () => [spaceShare]
+              },
+              actions: {
+                loadSpaceMembers: jest.fn()
+              },
               mutations: {
                 UPSERT_SPACE: jest.fn()
               }
diff --git a/packages/web-runtime/src/store/spaces.ts b/packages/web-runtime/src/store/spaces.ts
index f0be961b823..f86cbd6247f 100644
--- a/packages/web-runtime/src/store/spaces.ts
+++ b/packages/web-runtime/src/store/spaces.ts
@@ -1,17 +1,22 @@
 import { buildSpace } from 'web-client/src/helpers'
 import Vue from 'vue'
 import { set, has } from 'lodash-es'
+import { unref } from '@vue/composition-api'
+import { buildSpaceShare } from 'files/src/helpers/resources'
+import { sortSpaceMembers } from 'files/src/helpers/space'
 
 const state = {
-  spaces: []
+  spaces: [],
+  spaceMembers: []
 }
 
 const getters = {
-  spaces: (state) => state.spaces
+  spaces: (state) => state.spaces,
+  spaceMembers: (state) => state.spaceMembers
 }
 
 const mutations = {
-  LOAD_SPACES(state, spaces) {
+  SET_SPACES(state, spaces) {
     state.spaces = spaces
   },
   /**
@@ -57,6 +62,29 @@ const mutations = {
   },
   CLEAR_SPACES(state) {
     state.spaces = []
+  },
+  CLEAR_SPACE_MEMBERS(state) {
+    state.spaceMembers = []
+  },
+  SET_SPACE_MEMBERS(state, members) {
+    state.spaceMembers = members
+  },
+  UPSERT_SPACE_MEMBERS(state, member) {
+    const fileIndex = state.spaceMembers.findIndex((s) => {
+      return member.id === s.id && member.collaborator.name === s.collaborator.name
+    })
+
+    if (fileIndex >= 0) {
+      Vue.set(state.spaceMembers, fileIndex, member)
+    } else {
+      // share was not present in the list while updating, add it instead
+      state.spaceMembers.push(member)
+    }
+  },
+  REMOVE_SPACE_MEMBER(state, member) {
+    state.spaceMembers = state.spaceMembers.filter(
+      (s) => member.id === s.id && member.collaborator.name !== s.collaborator.name
+    )
   }
 }
 
@@ -68,7 +96,59 @@ const actions = {
     }
 
     const spaces = graphResponse.data.value.map((space) => buildSpace(space))
-    context.commit('LOAD_SPACES', spaces)
+    context.commit('SET_SPACES', spaces)
+  },
+  loadSpaceMembers(context, { graphClient, space }) {
+    context.commit('CLEAR_SPACE_MEMBERS')
+    const promises = []
+    const spaceShares = []
+
+    for (const role of Object.keys(space.spaceRoles)) {
+      for (const userId of space.spaceRoles[role]) {
+        promises.push(
+          unref(graphClient)
+            .users.getUser(userId)
+            .then((resolved) => {
+              spaceShares.push(buildSpaceShare({ ...resolved.data, role }, space.id))
+            })
+        )
+      }
+    }
+
+    return Promise.all(promises).then(() => {
+      context.commit('SET_SPACE_MEMBERS', sortSpaceMembers(spaceShares))
+    })
+  },
+  addSpaceMember(context, { client, path, shareWith, permissions, role, storageId, displayName }) {
+    return client.shares
+      .shareSpaceWithUser(path, shareWith, storageId, { permissions, role: role.name })
+      .then(() => {
+        const shareObj = { role: role.name, onPremisesSamAccountName: shareWith, displayName }
+        context.commit('UPSERT_SPACE_MEMBERS', buildSpaceShare(shareObj, storageId))
+      })
+  },
+  changeSpaceMember(context, { client, share, permissions, role }) {
+    return client.shares
+      .shareSpaceWithUser('', share.collaborator.name, share.id, { permissions, role: role.name })
+      .then(() => {
+        const spaceShare = buildSpaceShare(
+          {
+            role: role.name,
+            onPremisesSamAccountName: share.collaborator.name,
+            displayName: share.collaborator.displayName
+          },
+          share.id
+        )
+
+        context.commit('UPSERT_SPACE_MEMBERS', spaceShare)
+      })
+  },
+  deleteSpaceMember(context, { client, share }) {
+    const additionalParams = { shareWith: share.collaborator.name } as any
+
+    return client.shares.deleteShare(share.id, additionalParams).then(() => {
+      context.commit('REMOVE_SPACE_MEMBER', share)
+    })
   }
 }