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 70020e179a1c53540f64fb011255f4eb3e91f633..5eedf9f5d27de944b439ae2e5941b080a06c97fa 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
@@ -25,7 +25,6 @@ package de.ozgcloud.common.binaryfile;
 
 import com.google.protobuf.ByteString;
 import de.ozgcloud.common.errorhandling.TechnicalException;
-import io.grpc.Context;
 import io.grpc.stub.CallStreamObserver;
 import lombok.Builder;
 import lombok.extern.log4j.Log4j2;
@@ -78,7 +77,7 @@ public class GrpcBinaryFileServerDownloader<T> {
 
 	void doStart() {
 		handleSafety(this::setupStreams);
-		taskExecutor.execute(Context.current().wrap(this::startDownload));
+		taskExecutor.execute(this::startDownload);
 		callObserver.setOnReadyHandler(this::onReadyHandler);
 	}
 
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 ed67be0343b394aa972998f64641b63ba320e69b..38bb3a5e9f607b9abfa9cd17ba7af4263e126560 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
@@ -119,13 +119,6 @@ class GrpcBinaryFileServerDownloaderTest {
 	@Nested
 	class TestDoStart {
 
-		@Mock
-		private Context callContext;
-		@Mock
-		private Runnable wrappedRunnable;
-
-		@Captor
-		private ArgumentCaptor<Runnable> wrappedRunnableCaptor;
 		@Captor
 		private ArgumentCaptor<Runnable> runnableCaptor;
 		@Captor
@@ -143,31 +136,15 @@ class GrpcBinaryFileServerDownloaderTest {
 			verify(downloader).setupStreams();
 		}
 
-		@Test
-		void shouldCallTaskExecutor() {
-			try (var contextMock = mockStatic(Context.class)) {
-				contextMock.when(Context::current).thenReturn(callContext);
-				when(callContext.wrap(any(Runnable.class))).thenReturn(wrappedRunnable);
-
-				downloader.doStart();
-
-				verify(taskExecutor).execute(wrappedRunnable);
-			}
-		}
-
 		@Test
 		void shouldCallStartDownload() {
-			try (var contextMock = mockStatic(Context.class)) {
-				contextMock.when(Context::current).thenReturn(callContext);
-				when(callContext.wrap(any(Runnable.class))).thenReturn(wrappedRunnable);
-				doNothing().when(downloader).startDownload();
+			doNothing().when(downloader).startDownload();
 
-				downloader.doStart();
+			downloader.doStart();
 
-				verify(callContext).wrap(wrappedRunnableCaptor.capture());
-				wrappedRunnableCaptor.getValue().run();
-				verify(downloader).startDownload();
-			}
+			verify(taskExecutor).execute(runnableCaptor.capture());
+			runnableCaptor.getValue().run();
+			verify(downloader).startDownload();
 		}
 
 		@SneakyThrows