diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownload.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownload.kt
index d5727dd88..c54404d5d 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownload.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferDownload.kt
@@ -96,7 +96,7 @@ suspend fun handleTransferDownload(
     }
     downloadManager.cancelAndRemove(id)
     transferManager.writeDownloadManagerId(
-        transferUUID = transfer.uuid,
+        transfer = transfer,
         fileUid = targetFile?.uid,
         uniqueDownloadManagerId = null,
     )
@@ -104,10 +104,10 @@ suspend fun handleTransferDownload(
 
 fun downloadManagerId(
     transferManager: TransferManager,
-    transferUuid: String,
+    transfer: TransferUi,
     fileUid: String?,
 ): Flow<UniqueDownloadId?> = transferManager.downloadManagerIdFor(
-    transferUUID = transferUuid,
+    transfer = transfer,
     fileUid = fileUid,
 ).map { UniqueDownloadId(it ?: return@map null) }
 
@@ -139,7 +139,7 @@ private fun currentOrNewDownloadManagerId(
     direction: TransferDirection?,
 ): Flow<UniqueDownloadId> = downloadManagerId(
     transferManager = transferManager,
-    transferUuid = transfer.uuid,
+    transfer = transfer,
     fileUid = targetFile?.uid,
 ).mapLatest { id ->
     id ?: repeatWhileActive {
@@ -203,7 +203,7 @@ private suspend fun getNewDownloadId(
     val request = buildDownloadRequest(transfer, targetFile, apiUrlCreator, userAgent, direction) ?: return null
     val newId = downloadManager.startDownloadingFile(request)
     transferManager.writeDownloadManagerId(
-        transferUUID = transfer.uuid,
+        transfer = transfer,
         fileUid = targetFile?.uid,
         uniqueDownloadManagerId = newId?.value,
     )
@@ -238,7 +238,7 @@ private suspend fun buildDownloadRequest(
 
     when {
         targetFile != null -> {
-            url = apiUrlCreator.downloadFileUrl(transfer.uuid, targetFile.uid) ?: return null
+            url = apiUrlCreator.downloadFileUrl(transfer, targetFile.uid) ?: return null
             val fileName = DownloadManagerUtils.withoutProblematicCharacters(targetFile.fileName)
             name = "SwissTransfer/$fileName${if (targetFile.isFolder) ".zip" else ""}"
         }
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferManagerExt.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferManagerExt.kt
index 3dcfa9176..ad86f8319 100644
--- a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferManagerExt.kt
+++ b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transferdetails/TransferManagerExt.kt
@@ -41,7 +41,7 @@ fun TransferManager.previewUriForFile(
     thumbnailsLocalStorage: ThumbnailsLocalStorage,
 ): Flow<Uri?> = downloadManagerId(
     transferManager = this,
-    transferUuid = transfer.uuid,
+    transfer = transfer,
     fileUid = file.uid,
 ).transformLatest { uniqueDownloadId ->
     if (file.thumbnailPath != null) {