diff --git a/src/main/java/com/knecon/fforesight/tenantcommons/TenantProvider.java b/src/main/java/com/knecon/fforesight/tenantcommons/TenantProvider.java
index 08b8958..5807613 100644
--- a/src/main/java/com/knecon/fforesight/tenantcommons/TenantProvider.java
+++ b/src/main/java/com/knecon/fforesight/tenantcommons/TenantProvider.java
@@ -8,7 +8,6 @@ public interface TenantProvider {
 
     TenantResponse getTenant(String tenantId);
 
-
     List<TenantResponse> getTenants();
 
 }
diff --git a/src/main/java/com/knecon/fforesight/tenantcommons/TenantsClient.java b/src/main/java/com/knecon/fforesight/tenantcommons/TenantsClient.java
index 367d590..5626ab3 100644
--- a/src/main/java/com/knecon/fforesight/tenantcommons/TenantsClient.java
+++ b/src/main/java/com/knecon/fforesight/tenantcommons/TenantsClient.java
@@ -2,7 +2,7 @@ package com.knecon.fforesight.tenantcommons;
 
 import java.util.List;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -14,7 +14,7 @@ import com.knecon.fforesight.tenantcommons.model.TenantResponse;
 
 @FeignClient(name = "TenantsResource", url = "${tenant-user-management-service.url}")
 @ResponseStatus(value = HttpStatus.OK)
-@ConditionalOnProperty(prefix = "fforesight.springdoc", value = "remote", havingValue = "true")
+@ConditionalOnMissingBean(TenantProvider.class)
 public interface TenantsClient extends TenantProvider {
 
     String TENANT_PATH = "/tenants";