diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
index 77c2d6f5783ca3517ca59d279e386221d963a6bb..07379d8833ea981f6d9515d562e0f457d2709743 100644
--- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
+++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloader.java
@@ -107,10 +107,9 @@ public class GrpcBinaryFileServerDownloader<T> {
 	void startDownload() {
 		try {
 			doDownload();
-			closeOutputStream();
-			sendChunks();
 		} catch (Exception e) {
 			downloadError.set(new TechnicalException("Error while downloading file contents", e));
+		} finally {
 			closeOutputStream();
 		}
 	}
diff --git a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
index 8c3ad5a56eb8a52a3e8b079673406efd68b38420..f2f2ef48a7818513f9dce804058f25352fa171d5 100644
--- a/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
+++ b/ozgcloud-common-lib/src/test/java/de/ozgcloud/common/binaryfile/GrpcBinaryFileServerDownloaderTest.java
@@ -254,13 +254,6 @@ class GrpcBinaryFileServerDownloaderTest {
 
 				verify(outputStream).close();
 			}
-
-			@Test
-			void shouldSendChunks() {
-				downloader.startDownload();
-
-				verify(downloader).sendChunks();
-			}
 		}
 
 		@Nested