diff --git a/changelog/unreleased/enhancement-upload-data-during-creation b/changelog/unreleased/enhancement-upload-data-during-creation
new file mode 100644
index 00000000000..e4c66bddbe2
--- /dev/null
+++ b/changelog/unreleased/enhancement-upload-data-during-creation
@@ -0,0 +1,6 @@
+Enhancement: Upload data during creation
+
+Uploading via tus now uses the `uploadDataDuringCreation` option which saves up one request. Also, we've fixed a serialization error during uploads, saving up another request.
+
+https://github.com/owncloud/web/pull/7111
+https://github.com/owncloud/web/issues/7066
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 27fb1977fdd..2f08cd50176 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -673,7 +673,7 @@ export default defineComponent({
       const uploadSizeSpaceMapping = uppyResources.reduce((acc, uppyResource) => {
         let targetUploadSpace
 
-        if (uppyResource.meta.routeStorage === 'home') {
+        if (uppyResource.meta.routeName === 'files-spaces-personal') {
           targetUploadSpace = this.spaces.find((space) => space.driveType === 'personal')
         } else {
           targetUploadSpace = this.spaces.find(
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
index 0ea9f892b2a..07245454d50 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
@@ -176,7 +176,7 @@ describe('CreateAndUpload component', () => {
               size: 1001
             },
             meta: {
-              routeStorage: 'home'
+              routeName: 'files-spaces-personal'
             }
           }
         ])
diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index b38f27379bf..3234e9c418d 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -465,7 +465,6 @@ export default {
         query: targetRoute.query,
         params: {
           ...(storageId && path && { storageId }),
-          ...(targetRoute.params?.storage && { storage: targetRoute.params?.storage }),
           ...(targetRoute.params?.shareName && { shareName: targetRoute.params?.shareName })
         }
       }