diff --git a/src/main/java/com/knecon/fforesight/keycloakcommons/DefaultKeyCloakCommonsAutoConfiguration.java b/src/main/java/com/knecon/fforesight/keycloakcommons/DefaultKeyCloakCommonsAutoConfiguration.java
index 768a1c3..756917f 100644
--- a/src/main/java/com/knecon/fforesight/keycloakcommons/DefaultKeyCloakCommonsAutoConfiguration.java
+++ b/src/main/java/com/knecon/fforesight/keycloakcommons/DefaultKeyCloakCommonsAutoConfiguration.java
@@ -1,6 +1,7 @@
 package com.knecon.fforesight.keycloakcommons;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 
@@ -8,6 +9,7 @@ import com.knecon.fforesight.keycloakcommons.security.properties.CommonsKeyCloak
 
 @ComponentScan
 @AutoConfiguration
+@ConditionalOnProperty(prefix = "fforesight.keycloak", value = "enabled", havingValue = "true")
 @EnableConfigurationProperties(CommonsKeyCloakProperties.class)
 public class DefaultKeyCloakCommonsAutoConfiguration {
 
diff --git a/src/main/java/com/knecon/fforesight/keycloakcommons/security/properties/CommonsKeyCloakProperties.java b/src/main/java/com/knecon/fforesight/keycloakcommons/security/properties/CommonsKeyCloakProperties.java
index 1883eec..09fe1bd 100644
--- a/src/main/java/com/knecon/fforesight/keycloakcommons/security/properties/CommonsKeyCloakProperties.java
+++ b/src/main/java/com/knecon/fforesight/keycloakcommons/security/properties/CommonsKeyCloakProperties.java
@@ -12,5 +12,6 @@ import lombok.Data;
 public class CommonsKeyCloakProperties {
 
     private List<String> ignoredEndpoints = new ArrayList<>();
+    private boolean enabled;
 
 }