diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
index 086f5981beb68c0b5b5c4e797db457316309cc1e..6ae490901560533bc305fe6092c615cddba68d9d 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangManagerServerResolver.java
@@ -112,6 +112,11 @@ public class VorgangManagerServerResolver {
 		var channel = createChannel(channelName);
 		var stub = stubFactory.createStub(stubClass, channel);
 		stub = applyStubTransformers(stub, channelName);
+		return buildClosableStub(stub, channel);
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T extends AbstractStub<?>> ClosableStub<T> buildClosableStub(AbstractStub<?> stub, ManagedChannel channel) {
 		return ClosableStub.<T>builder().stub((T) stub).channel(channel).build();
 	}
 
@@ -131,6 +136,11 @@ public class VorgangManagerServerResolver {
 		var channelName = getChannelName(organisationsEinheitId);
 		var stub = stubFactory.createStub(stubClass, createChannelByName(channelName));
 		stub = applyStubTransformers(stub, channelName);
+		return buildConsistingStub(stub);
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T extends AbstractStub<?>> ConsistingStub<T> buildConsistingStub(AbstractStub<?> stub) {
 		return ConsistingStub.<T>builder().stub((T) stub).build();
 	}