diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 8399fdf8c9e72d483b56a615dabb6203cd8654ac..b95fe9a9ebad316c07aee8cc3e5f01b95624a518 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -51,7 +51,7 @@
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
 
 		<zufi-manager-interface.version>1.6.0</zufi-manager-interface.version>
-		<common-lib.version>4.12.0</common-lib.version>
+		<common-lib.version>4.13.0-OZG-7573-files-weiterleitung-bug-SNAPSHOT</common-lib.version>
 		<user-manager-interface.version>2.12.0</user-manager-interface.version>
 		<processor-manager.version>0.5.0</processor-manager.version>
 		<nachrichten-manager.version>2.19.0</nachrichten-manager.version>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
index e3dbaee2eba1f5fe7b4cfd5f4791d2fcb54edf4f..2909ed3b5712195f45ae6aab8623b0db9998fd27 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
@@ -11,6 +11,7 @@ import java.util.function.Function;
 import com.google.protobuf.ByteString;
 
 import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils;
+import de.ozgcloud.common.binaryfile.StreamingFileSender;
 import de.ozgcloud.eingang.forwarder.RouteForwardingServiceGrpc;
 import de.ozgcloud.eingang.forwarding.GrpcAttachment;
 import de.ozgcloud.eingang.forwarding.GrpcFileContent;
@@ -93,15 +94,14 @@ class EingangForwarder {
 
 	private CompletableFuture<GrpcRouteForwardingResponse> sendAttachmentFile(String groupName, IncomingFile file) {
 		var fileContentStream = fileService.getUploadedFileStream(file.getId());
-		var sender = createAttachmentFileSender(groupName, file, fileContentStream).send(responseObserver::registerOnReadyHandler);
+		var sender = createAttachmentFileSender(groupName, file, fileContentStream).send();
 		return sender.getResultFuture();
 	}
 
-	GrpcFileUploadUtils.FileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createAttachmentFileSender(String groupName,
+	StreamingFileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createAttachmentFileSender(String groupName,
 			IncomingFile file,
 			InputStream fileContentStream) {
-		return createSenderWithoutMetadata(this::buildAttachmentChunk, fileContentStream)
-				.withMetaData(buildGrpcAttachmentFile(groupName, file));
+		return createSenderWithoutMetadata(this::buildAttachmentChunk, fileContentStream).withMetaData(buildGrpcAttachmentFile(groupName, file));
 	}
 
 	GrpcRouteForwardingRequest buildAttachmentChunk(byte[] chunk, int length) {
@@ -136,11 +136,11 @@ class EingangForwarder {
 
 	private CompletableFuture<GrpcRouteForwardingResponse> sendRepresentationFile(IncomingFile file) {
 		var fileContentStream = fileService.getUploadedFileStream(file.getId());
-		var sender = createRepresentationFileSender(file, fileContentStream).send(responseObserver::registerOnReadyHandler);
+		var sender = createRepresentationFileSender(file, fileContentStream).send();
 		return sender.getResultFuture();
 	}
 
-	GrpcFileUploadUtils.FileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createRepresentationFileSender(IncomingFile file,
+	StreamingFileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createRepresentationFileSender(IncomingFile file,
 			InputStream fileContentStream) {
 		return createSenderWithoutMetadata(this::buildRepresentationChunk, fileContentStream).withMetaData(buildGrpcRepresentationFile(file));
 	}
@@ -171,9 +171,9 @@ class EingangForwarder {
 		return fileContentBuilder.build();
 	}
 
-	GrpcFileUploadUtils.FileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createSenderWithoutMetadata(
+	StreamingFileSender<GrpcRouteForwardingRequest, GrpcRouteForwardingResponse> createSenderWithoutMetadata(
 			BiFunction<byte[], Integer, GrpcRouteForwardingRequest> chunkBuilder, InputStream fileContentStream) {
-		return GrpcFileUploadUtils.createSender(chunkBuilder, fileContentStream, response -> requestObserver, false);
+		return GrpcFileUploadUtils.createStreamSharingSender(chunkBuilder, fileContentStream, requestObserver, responseObserver::registerOnReadyHandler);
 	}
 
 	@RequiredArgsConstructor