diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
index 2bde79359b68..ff931fa75578 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
@@ -271,7 +271,7 @@ class FileUploadWorker(
             }
 
             fileUploadEventBroadcaster.sendUploadEnqueued(context)
-            val operation = uploadFileOperationFactory.create(upload, this@FileUploadWorker)
+            val operation = uploadFileOperationFactory.create(context, upload, this@FileUploadWorker)
             activeOperations[upload.uploadId] = operation
 
             val currentIndex = (index + 1)
diff --git a/app/src/main/java/com/owncloud/android/operations/factory/UploadFileOperationFactory.kt b/app/src/main/java/com/owncloud/android/operations/factory/UploadFileOperationFactory.kt
index 9fc0d558710b..1e14e0950bd2 100644
--- a/app/src/main/java/com/owncloud/android/operations/factory/UploadFileOperationFactory.kt
+++ b/app/src/main/java/com/owncloud/android/operations/factory/UploadFileOperationFactory.kt
@@ -24,12 +24,10 @@ class UploadFileOperationFactory @Inject constructor(
     private val uploadsStorageManager: UploadsStorageManager,
     private val connectivityService: ConnectivityService,
     private val powerManagementService: PowerManagementService,
-    private val context: Context,
-    private val accountManager: UserAccountManager,
-    private val fileDataStorageManager: FileDataStorageManager
+    private val accountManager: UserAccountManager
 ) {
-
     fun create(
+        context: Context,
         upload: OCUpload,
         progressListener: OnDatatransferProgressListener? = null,
         disableRetries: Boolean = true
@@ -46,7 +44,7 @@ class UploadFileOperationFactory @Inject constructor(
         upload.isUseWifiOnly,
         upload.isWhileChargingOnly,
         disableRetries,
-        fileDataStorageManager
+        FileDataStorageManager(accountManager.user, context.contentResolver)
     ).apply {
         progressListener?.let { addDataTransferProgressListener(it) }
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
index 7cf9c37b2aa4..cb6c70581622 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt
@@ -339,7 +339,7 @@ class UploadListActivity :
             }
 
             val result = uploadFileOperationFactory
-                .create(upload)
+                .create(this@UploadListActivity, upload)
                 .execute(client)
 
             if (result.isSuccess) {