diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
index be581fef..68a53877 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/CertificateRevocationListController.java
@@ -48,6 +48,7 @@
 import java.time.ZonedDateTime;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -69,6 +70,7 @@
 @RequiredArgsConstructor
 @Validated
 @Slf4j
+@ConditionalOnProperty(name = "revocation-list.controller.enabled", havingValue = "true")
 public class CertificateRevocationListController {
 
     private final RevocationListService revocationListService;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ba197cfa..ef191da0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -107,3 +107,7 @@ dgc:
 springdoc:
   api-docs:
     enabled: false
+
+revocation-list:
+  controller:
+    enabled: false
\ No newline at end of file