diff --git a/changelog/unreleased/bugfix-re-fetch-quota b/changelog/unreleased/bugfix-re-fetch-quota
new file mode 100644
index 00000000000..442b03d8c48
--- /dev/null
+++ b/changelog/unreleased/bugfix-re-fetch-quota
@@ -0,0 +1,8 @@
+Bugfix: Re-fetch quota
+
+We've fixed a bug where uploading, deleting or restoring resources doesn't always re-fetch the quota and therefore
+was falsy displayed.
+
+https://github.com/owncloud/web/pull/7415
+https://github.com/owncloud/web/issues/6930
+https://github.com/owncloud/web/issues/7389
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 98c2040c9a3..0f0f615fcfd 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -122,9 +122,12 @@ import MixinFileActions, { EDITOR_MODE_CREATE } from '../../mixins/fileActions'
 import { buildResource, buildWebDavFilesPath, buildWebDavSpacesPath } from '../../helpers/resources'
 import { isLocationPublicActive, isLocationSpacesActive } from '../../router'
 import { useActiveLocation } from '../../composables'
+import { useGraphClient } from 'web-client/src/composables'
+
 import {
   useRequest,
   useCapabilityShareJailEnabled,
+  useCapabilitySpacesEnabled,
   useStore,
   usePublicLinkPassword,
   useUserContext
@@ -151,7 +154,6 @@ export default defineComponent({
 
     onMounted(() => {
       const filesSelectedSub = uppyService.subscribe('filesSelected', instance.onFilesSelected)
-      const uploadSuccessSub = uppyService.subscribe('uploadSuccess', instance.onFileSuccess)
       const uploadCompletedSub = uppyService.subscribe('uploadCompleted', instance.onUploadComplete)
 
       uppyService.useDropTarget({
@@ -161,7 +163,6 @@ export default defineComponent({
 
       instance.$on('beforeDestroy', () => {
         uppyService.unsubscribe('filesSelected', filesSelectedSub)
-        uppyService.unsubscribe('uploadSuccess', uploadSuccessSub)
         uppyService.unsubscribe('uploadCompleted', uploadCompletedSub)
         uppyService.removeDropTarget()
       })
@@ -173,12 +174,14 @@ export default defineComponent({
       }),
       ...useUploadHelpers(),
       ...useRequest(),
+      ...useGraphClient(),
       isPersonalLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-personal'),
       isPublicLocation: useActiveLocation(isLocationPublicActive, 'files-public-files'),
       isSpacesProjectsLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-projects'),
       isSpacesProjectLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-project'),
       isSpacesShareLocation: useActiveLocation(isLocationSpacesActive, 'files-spaces-share'),
       hasShareJail: useCapabilityShareJailEnabled(),
+      hasSpaces: useCapabilitySpacesEnabled(),
       publicLinkPassword: usePublicLinkPassword({ store }),
       isUserContext: useUserContext({ store })
     }
@@ -278,16 +281,10 @@ export default defineComponent({
       'setModalInputErrorMessage',
       'hideModal'
     ]),
-    ...mapMutations('Files', ['UPSERT_RESOURCE']),
+    ...mapMutations('Files', ['UPSERT_RESOURCE', 'UPDATE_SPACE_FIELD']),
     ...mapMutations(['SET_QUOTA']),
 
-    onFileSuccess() {
-      if (this.user?.quota) {
-        this.SET_QUOTA(this.user.quota)
-      }
-    },
-
-    onUploadComplete(result) {
+    async onUploadComplete(result) {
       if (result.successful) {
         const file = result.successful[0]
 
@@ -295,6 +292,20 @@ export default defineComponent({
           return
         }
 
+        if (this.isSpacesProjectLocation || this.isPersonalLocation) {
+          if (this.hasSpaces) {
+            const driveResponse = await this.graphClient.drives.getDrive(file.meta.routeStorageId)
+            this.UPDATE_SPACE_FIELD({
+              id: driveResponse.data.id,
+              field: 'spaceQuota',
+              value: driveResponse.data.quota
+            })
+          } else {
+            const user = await this.$client.users.getUser(this.user.id)
+            this.SET_QUOTA(user.quota)
+          }
+        }
+
         let pathFileWasUploadedTo = file.meta.currentFolder
         if (file.meta.relativeFolder) {
           pathFileWasUploadedTo += file.meta.relativeFolder
diff --git a/packages/web-app-files/src/components/SpaceQuota.vue b/packages/web-app-files/src/components/SpaceQuota.vue
index 63d98068789..51094ee35af 100644
--- a/packages/web-app-files/src/components/SpaceQuota.vue
+++ b/packages/web-app-files/src/components/SpaceQuota.vue
@@ -2,7 +2,7 @@
   <div class="space-quota">
     <p class="oc-mb-s oc-mt-rm" v-text="spaceStorageDetailsLabel" />
     <oc-progress
-      :value="parseInt(quotaUsagePercent)"
+      :value="quotaUsagePercent"
       :max="100"
       size="small"
       :variation="quotaProgressVariant"
@@ -45,7 +45,7 @@ export default {
       return filesize(this.spaceQuota.used)
     },
     quotaUsagePercent() {
-      return ((this.spaceQuota.used / this.spaceQuota.total) * 100).toFixed(1)
+      return parseFloat(((this.spaceQuota.used / this.spaceQuota.total) * 100).toFixed(2))
     },
     quotaProgressVariant() {
       switch (this.spaceQuota.state) {
diff --git a/packages/web-app-files/src/mixins/actions/restore.js b/packages/web-app-files/src/mixins/actions/restore.js
index 8727d86e353..f5f9de7e32b 100644
--- a/packages/web-app-files/src/mixins/actions/restore.js
+++ b/packages/web-app-files/src/mixins/actions/restore.js
@@ -1,4 +1,4 @@
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 import PQueue from 'p-queue'
 import { isLocationTrashActive } from '../../router'
 import {
@@ -7,10 +7,14 @@ import {
   buildWebDavSpacesTrashPath,
   buildWebDavSpacesPath
 } from '../../helpers/resources'
+import { clientService } from 'web-pkg/src/services'
 
 export default {
   computed: {
     ...mapState(['user']),
+    ...mapState('Files', ['spaces']),
+    ...mapGetters(['configuration', 'capabilities']),
+    ...mapGetters('runtime/auth', ['accessToken']),
 
     $_restore_items() {
       return [
@@ -41,6 +45,8 @@ export default {
   methods: {
     ...mapActions('Files', ['removeFilesFromTrashbin']),
     ...mapActions(['showMessage']),
+    ...mapMutations('Files', ['UPDATE_SPACE_FIELD']),
+    ...mapMutations(['SET_QUOTA']),
 
     async $_restore_trigger({ resources }) {
       const restoredResources = []
@@ -102,6 +108,26 @@ export default {
           status: 'danger'
         })
       }
+
+      // Load quota
+      if (this.capabilities?.spaces?.enabled) {
+        const graphClient = clientService.graphAuthenticated(
+          this.configuration.server,
+          this.accessToken
+        )
+        const driveId = isLocationTrashActive(this.$router, 'files-trash-spaces-project')
+          ? this.$route.params.storageId
+          : this.spaces.find((s) => s.driveType === 'personal').id
+        const driveResponse = await graphClient.drives.getDrive(driveId)
+        this.UPDATE_SPACE_FIELD({
+          id: driveResponse.data.id,
+          field: 'spaceQuota',
+          value: driveResponse.data.quota
+        })
+      } else {
+        const user = await this.$client.users.getUser(this.user.id)
+        this.SET_QUOTA(user.quota)
+      }
     }
   }
 }
diff --git a/packages/web-app-files/src/mixins/deleteResources.js b/packages/web-app-files/src/mixins/deleteResources.js
index 8a9b8b5fea6..40762c4a174 100644
--- a/packages/web-app-files/src/mixins/deleteResources.js
+++ b/packages/web-app-files/src/mixins/deleteResources.js
@@ -3,7 +3,8 @@ import { cloneStateObject } from '../helpers/store'
 import { isSameResource } from '../helpers/resource'
 import { buildWebDavFilesTrashPath, buildWebDavSpacesTrashPath } from '../helpers/resources'
 import PQueue from 'p-queue'
-import { isLocationTrashActive } from '../router'
+import { isLocationTrashActive, isLocationSpacesActive } from '../router'
+import { clientService } from 'web-pkg/src/services'
 
 export default {
   data: () => ({
@@ -14,8 +15,9 @@ export default {
 
   computed: {
     ...mapGetters('Files', ['selectedFiles']),
-    ...mapGetters(['user']),
+    ...mapGetters(['user', 'configuration', 'capabilities']),
     ...mapGetters('runtime/auth', { isPublicLinkContext: 'isPublicLinkContextReady' }),
+    ...mapGetters('runtime/auth', ['accessToken']),
 
     $_deleteResources_isInTrashbin() {
       return (
@@ -97,6 +99,7 @@ export default {
   methods: {
     ...mapActions('Files', ['pushResourcesToDeleteList', 'removeFilesFromTrashbin', 'deleteFiles']),
     ...mapActions(['showMessage', 'toggleModalConfirmButton', 'hideModal', 'createModal']),
+    ...mapMutations('Files', ['UPDATE_SPACE_FIELD']),
     ...mapMutations(['SET_QUOTA']),
 
     $_deleteResources_trashbin_deleteOp(resource) {
@@ -160,9 +163,27 @@ export default {
         this.toggleModalConfirmButton()
 
         // Load quota
-        if (this.user?.id) {
-          const user = await this.$client.users.getUser(this.user.id)
-          this.SET_QUOTA(user.quota)
+        if (
+          isLocationSpacesActive(this.$router, 'files-spaces-project') ||
+          isLocationSpacesActive(this.$router, 'files-spaces-personal')
+        ) {
+          if (this.capabilities?.spaces?.enabled) {
+            const graphClient = clientService.graphAuthenticated(
+              this.configuration.server,
+              this.accessToken
+            )
+            const driveResponse = await graphClient.drives.getDrive(
+              this.$_deleteResources_resources[0].storageId
+            )
+            this.UPDATE_SPACE_FIELD({
+              id: driveResponse.data.id,
+              field: 'spaceQuota',
+              value: driveResponse.data.quota
+            })
+          } else {
+            const user = await this.$client.users.getUser(this.user.id)
+            this.SET_QUOTA(user.quota)
+          }
         }
 
         let parentFolderPath
diff --git a/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts b/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
index e6159aa6a5b..1e13c0f5215 100644
--- a/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
+++ b/packages/web-app-files/src/services/folder/legacy/loaderPersonal.ts
@@ -55,12 +55,6 @@ export class FolderLoaderLegacyPersonal implements FolderLoader {
           currentFolder,
           files: resources
         })
-
-        // fetch user quota
-        ;(async () => {
-          const user = await client.users.getUser(router.currentRoute.params.storageId)
-          store.commit('SET_QUOTA', user.quota)
-        })()
       } catch (error) {
         store.commit('Files/SET_CURRENT_FOLDER', null)
         console.error(error)
diff --git a/packages/web-app-files/src/services/folder/spaces/loaderPersonal.ts b/packages/web-app-files/src/services/folder/spaces/loaderPersonal.ts
index 3bd64974445..1062f4b9a24 100644
--- a/packages/web-app-files/src/services/folder/spaces/loaderPersonal.ts
+++ b/packages/web-app-files/src/services/folder/spaces/loaderPersonal.ts
@@ -51,12 +51,6 @@ export class FolderLoaderSpacesPersonal implements FolderLoader {
           currentFolder,
           files: resources
         })
-
-        // fetch user quota
-        ;(async () => {
-          const user = await clientService.owncloudSdk.users.getUser(ref.user.id)
-          store.commit('SET_QUOTA', user.quota)
-        })()
       } catch (error) {
         store.commit('Files/SET_CURRENT_FOLDER', null)
         console.error(error)
diff --git a/packages/web-app-files/tests/unit/components/__snapshots__/SpaceQuota.spec.js.snap b/packages/web-app-files/tests/unit/components/__snapshots__/SpaceQuota.spec.js.snap
index f6d007d7977..3351829570d 100644
--- a/packages/web-app-files/tests/unit/components/__snapshots__/SpaceQuota.spec.js.snap
+++ b/packages/web-app-files/tests/unit/components/__snapshots__/SpaceQuota.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`SpaceQuota component renders the space storage quota label 1`] = `
 <div class="space-quota">
-  <p class="oc-mb-s oc-mt-rm">1 B of 10 B used (10.0% used)</p>
+  <p class="oc-mb-s oc-mt-rm">1 B of 10 B used (10% used)</p>
   <oc-progress-stub value="10" max="100" size="small" variation="primary"></oc-progress-stub>
 </div>
 `;
diff --git a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
index 521a512cb1d..53a137942e9 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
@@ -101,7 +101,8 @@ function getWrapper({ invalidLocation = false, resolveClearTrashBin: resolveRest
       getters: {
         configuration: () => ({
           server: 'https://example.com'
-        })
+        }),
+        capabilities: () => {}
       },
       modules: {
         user: {
@@ -119,6 +120,9 @@ function getWrapper({ invalidLocation = false, resolveClearTrashBin: resolveRest
             removeFilesFromTrashbin: jest.fn()
           }
         }
+      },
+      mutations: {
+        SET_QUOTA: () => jest.fn()
       }
     })
   })
diff --git a/packages/web-app-files/tests/unit/mixins/deleteResources.spec.js b/packages/web-app-files/tests/unit/mixins/deleteResources.spec.js
index 6c9acb38c3e..549ec37e524 100644
--- a/packages/web-app-files/tests/unit/mixins/deleteResources.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/deleteResources.spec.js
@@ -2,6 +2,7 @@ import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
 import deleteResources from '@files/src/mixins/deleteResources.js'
+import { createLocationSpaces } from '../../../src/router'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
@@ -27,9 +28,10 @@ describe('deleteResources', () => {
       const resourcesToDelete = [{ id: 2, path: '/' }]
       const wrapper = getWrapper(resourcesToDelete)
       const spyHideModalStub = jest.spyOn(wrapper.vm, 'hideModal')
+      const spyRouterPushStub = jest.spyOn(wrapper.vm.$router, 'push')
       await wrapper.vm.$_deleteResources_filesList_delete()
       await wrapper.vm.$nextTick()
-      expect(wrapper.vm.$router.length).toBeGreaterThanOrEqual(0)
+      expect(spyRouterPushStub).toHaveBeenCalledTimes(0)
       expect(spyHideModalStub).toHaveBeenCalledTimes(1)
     })
 
@@ -37,9 +39,10 @@ describe('deleteResources', () => {
       const resourcesToDelete = [currentFolder]
       const wrapper = getWrapper(resourcesToDelete)
       const spyHideModalStub = jest.spyOn(wrapper.vm, 'hideModal')
+      const spyRouterPushStub = jest.spyOn(wrapper.vm.$router, 'push')
       await wrapper.vm.$_deleteResources_filesList_delete()
       await wrapper.vm.$nextTick()
-      expect(wrapper.vm.$router.length).toBeGreaterThanOrEqual(1)
+      expect(spyRouterPushStub).toHaveBeenCalledTimes(1)
       expect(spyHideModalStub).toHaveBeenCalledTimes(1)
     })
   })
@@ -52,7 +55,15 @@ function getWrapper(resourcesToDelete) {
       $route: {
         name: 'files-personal'
       },
-      $router: [],
+      $router: {
+        currentRoute: createLocationSpaces('files-spaces-personal'),
+        resolve: (r) => {
+          return {
+            href: r.name
+          }
+        },
+        push: jest.fn()
+      },
       $client: {
         users: {
           getUser: jest.fn(() => user)
@@ -67,7 +78,11 @@ function getWrapper(resourcesToDelete) {
       getters: {
         user: () => {
           return { id: 'marie' }
-        }
+        },
+        configuration: () => ({
+          server: 'https://example.com'
+        }),
+        capabilities: () => {}
       },
       modules: {
         Files: {
diff --git a/packages/web-runtime/src/components/Topbar/UserMenu.vue b/packages/web-runtime/src/components/Topbar/UserMenu.vue
index ac5057d0d3d..458b8df59c5 100644
--- a/packages/web-runtime/src/components/Topbar/UserMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/UserMenu.vue
@@ -64,7 +64,7 @@
             </p>
             <oc-progress
               v-if="limitedPersonalStorage"
-              :value="quota.relative"
+              :value="quotaUsagePercent"
               :max="100"
               size="small"
               :variation="quotaProgressVariant"
@@ -77,10 +77,11 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import filesize from 'filesize'
 import isNil from 'lodash-es/isNil'
 import { authService } from '../../services/auth'
+import { useCapabilitySpacesEnabled } from 'web-pkg/src/composables'
 
 export default {
   props: {
@@ -90,8 +91,24 @@ export default {
       default: () => []
     }
   },
+  setup() {
+    return {
+      hasSpaces: useCapabilitySpacesEnabled()
+    }
+  },
   computed: {
     ...mapGetters(['quota', 'user']),
+    ...mapGetters({ legacyQuota: 'quota' }),
+    ...mapState('Files', ['spaces']),
+
+    quota() {
+      return this.hasSpaces
+        ? this.spaces.find((s) => s.driveType === 'personal')?.spaceQuota
+        : this.legacyQuota
+    },
+    useLegacyQuota() {
+      return !this.hasSpaces
+    },
 
     userId() {
       return this.user.username || this.user.id
@@ -101,7 +118,7 @@ export default {
         return this.$gettext('Personal storage')
       }
       return this.$gettextInterpolate(this.$gettext('Personal storage (%{percentage}% used)'), {
-        percentage: this.quota.relative || 0
+        percentage: this.quotaUsagePercent || 0
       })
     },
     personalStorageDetailsLabel() {
@@ -116,14 +133,24 @@ export default {
       )
     },
     limitedPersonalStorage() {
+      if (!this.useLegacyQuota) {
+        return this.quota.total !== 0
+      }
+
       return !isNil(this.quota.relative) && this.quota.definition !== 'none'
     },
     quotaEnabled() {
       return !!this.quota
     },
+    quotaUsagePercent() {
+      return this.useLegacyQuota
+        ? this.quota.relative
+        : parseFloat(((this.quota.used / this.quota.total) * 100).toFixed(2))
+    },
+
     quotaProgressVariant() {
-      if ((this.quota.relative || 0) < 80) return 'primary'
-      if ((this.quota.relative || 0) < 90) return 'warning'
+      if ((this.quotaUsagePercent || 0) < 80) return 'primary'
+      if ((this.quotaUsagePercent || 0) < 90) return 'warning'
       return 'danger'
     }
   },
diff --git a/packages/web-runtime/src/services/auth/userManager.ts b/packages/web-runtime/src/services/auth/userManager.ts
index 1aa18a006ae..9f2ef11297f 100644
--- a/packages/web-runtime/src/services/auth/userManager.ts
+++ b/packages/web-runtime/src/services/auth/userManager.ts
@@ -212,12 +212,13 @@ export class UserManager extends OidcUserManager {
       email: login?.email || user?.email || '',
       groups: userGroups,
       role,
-      language: login?.language,
-      ...(user.quota &&
-        user.quota.definition !== 'default' &&
-        user.quota.definition !== 'none' && { quota: user.quota })
+      language: login?.language
     })
 
+    if (!this.store.getters.capabilities.spaces?.enabled && user.quota) {
+      this.store.commit('SET_QUOTA', user.quota)
+    }
+
     await this.store.dispatch('loadSettingsValues')
   }
 
diff --git a/packages/web-runtime/src/store/user.ts b/packages/web-runtime/src/store/user.ts
index 5e5f2f6a95e..553d9451606 100644
--- a/packages/web-runtime/src/store/user.ts
+++ b/packages/web-runtime/src/store/user.ts
@@ -51,6 +51,12 @@ const mutations = {
     state.capabilities = data.capabilities
     state.version = data.version
   },
+  /**
+   * Legacy for oC10, in OCIS quota sticks on the respective drive
+   * @param state
+   * @param quota
+   * @constructor
+   */
   SET_QUOTA(state, quota) {
     // Turn strings into ints
     quota.free = parseInt(quota.free)