diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index 9086c962b3510ce0c11f1fb636c3ef8092d1682a..eb491729a67782b5246a1bae2863c12e035d93e4 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -169,8 +169,8 @@ public class OzgCloudClientAutoConfiguration {
 	}
 
 	@Bean
-	@Primary
 	@ConditionalOnProperty("ozgcloud.command-manager.address")
+	@ConditionalOnMissingBean(OzgCloudCommandService.class)
 	OzgCloudCommandService grpcOzgCloudCommandService(CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
 		var channel = ManagedChannelBuilder.forTarget(commandManagerProperties.getAddress()).usePlaintext().build();