diff --git a/app/src/main/java/com/infomaniak/drive/data/api/UploadTask.kt b/app/src/main/java/com/infomaniak/drive/data/api/UploadTask.kt
index ee7ac6dce2..eb8775d555 100644
--- a/app/src/main/java/com/infomaniak/drive/data/api/UploadTask.kt
+++ b/app/src/main/java/com/infomaniak/drive/data/api/UploadTask.kt
@@ -114,35 +114,24 @@ class UploadTask(
     }
 
     private suspend fun launchTask() = coroutineScope {
-        val chunkConfig = try {
-            fileChunkSizeManager.computeChunkConfig(
-                fileSize = uploadFile.fileSize,
-                defaultFileChunkSize = uploadFile.getValidChunks()?.validChuckSize?.toLong(),
-            )
-        } catch (exception: IllegalArgumentException) {
-            uploadFile.resetUploadTokenAndCancelSession()
-            fileChunkSizeManager.computeChunkConfig(fileSize = uploadFile.fileSize)
-        }
-
+        val chunkConfig = getChunkConfig()
         val totalChunks = chunkConfig.totalChunks
+        val uploadedChunks = uploadFile.getValidChunks()
+        val isNewUploadSession = uploadedChunks?.needToResetUpload(chunkConfig.fileChunkSize) ?: true
 
-        context.contentResolver.openInputStream(uploadFile.getOriginalUri(context))?.buffered()?.use { fileInputStream ->
-
-            val uploadedChunks = uploadFile.getValidChunks()
-            val isNewUploadSession = uploadedChunks?.needToResetUpload(chunkConfig.fileChunkSize) ?: true
-
-            val uploadHost = if (isNewUploadSession) {
-                uploadFile.prepareUploadSession(totalChunks)
-            } else {
-                uploadFile.uploadHost
-            }!!
+        val uploadHost = if (isNewUploadSession) {
+            uploadFile.prepareUploadSession(totalChunks)
+        } else {
+            uploadFile.uploadHost
+        }!!
 
+        Sentry.addBreadcrumb(Breadcrumb().apply {
+            category = UploadWorker.BREADCRUMB_TAG
+            message = "start ${uploadFile.fileName} with $totalChunks chunks and $uploadedChunks uploadedChunks"
+            level = SentryLevel.INFO
+        })
 
-            Sentry.addBreadcrumb(Breadcrumb().apply {
-                category = UploadWorker.BREADCRUMB_TAG
-                message = "start ${uploadFile.fileName} with $totalChunks chunks and $uploadedChunks uploadedChunks"
-                level = SentryLevel.INFO
-            })
+        context.contentResolver.openInputStream(uploadFile.getOriginalUri(context))?.buffered()?.use { fileInputStream ->
 
             SentryLog.d("kDrive", " upload task started with total chunk: $totalChunks, valid: $uploadedChunks")
 
@@ -160,6 +149,18 @@ class UploadTask(
         if (isActive) onFinish(uploadFile.getUriObject())
     }
 
+    private fun getChunkConfig(): FileChunkSizeManager.ChunkConfig {
+        return try {
+            fileChunkSizeManager.computeChunkConfig(
+                fileSize = uploadFile.fileSize,
+                defaultFileChunkSize = uploadFile.getValidChunks()?.validChuckSize?.toLong(),
+            )
+        } catch (exception: IllegalArgumentException) {
+            uploadFile.resetUploadTokenAndCancelSession()
+            fileChunkSizeManager.computeChunkConfig(fileSize = uploadFile.fileSize)
+        }
+    }
+
     private suspend fun uploadChunks(
         chunkConfig: FileChunkSizeManager.ChunkConfig,
         validChunksIds: List<Int>?,