diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
index 8f774351218c0ab146dd3afb7af73776b1311fb7..694e6b999b7dce08195e5648db629199daa63d27 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
@@ -1,6 +1,6 @@
 package de.ozgcloud.bescheid.dummy;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
 import com.google.common.net.MediaType;
@@ -12,7 +12,7 @@ import de.ozgcloud.bescheid.vorgang.Vorgang;
 import de.ozgcloud.common.binaryfile.TempFileUtils;
 
 @Service
-@ConditionalOnMissingBean(type = "BescheidRemoteService")
+@ConditionalOnProperty("ozgcloud.feature.bescheid.enable-dummy-document-processor")
 class DummyBescheidRemoteService implements BescheidRemoteService {
 
 	private static final String DUMMY_BESCHEID_FILE_NAME = "dummy-bescheid.pdf";
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
index 664f4300d8e1fa1220a1207f77d04d9553c77fb1..6dd87bd4b8bb2423fe933e8d4e098e056890f8fc 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
@@ -14,7 +14,6 @@ import javax.xml.xpath.XPathFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -50,7 +49,6 @@ import reactor.core.publisher.Mono;
 
 @Log4j2
 @Service
-@Primary
 @ConditionalOnProperty("ozgcloud.bescheid.smart-documents.url")
 class SmartDocumentsBescheidRemoteService implements BescheidRemoteService {
 
diff --git a/vorgang-manager-server/src/main/resources/application-local.yml b/vorgang-manager-server/src/main/resources/application-local.yml
index 346ab37983c1d9a1e395e8ba52c0d31823caca68..f575ac6f04eaec08c1ea13a5f28d849eebe0576c 100644
--- a/vorgang-manager-server/src/main/resources/application-local.yml
+++ b/vorgang-manager-server/src/main/resources/application-local.yml
@@ -53,6 +53,9 @@ ozgcloud:
   elasticsearch:
     initEnabled: true
     index: test-index
+  feature:
+    bescheid:
+      enable-dummy-document-processor: true
 
 
 mongock:
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
index d1eb5639cbb8bf5478328aef2186abbda5aedf5f..15dcb732418dc6e62afd04798a13887f79007efd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
@@ -72,6 +72,7 @@ import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
 		"grpc.server.port=-1",
 		"grpc.client.ozgcloud-command-manager.address=in-process:test",
 		"grpc.client.vorgang-manager.address=in-process:test",
+		"ozgcloud.feature.bescheid.enable-dummy-document-processor=true",
 })
 @DataITCase
 @DirtiesContext