diff --git a/src/main/java/com/vi/tenantservice/api/converter/TenantConverter.java b/src/main/java/com/vi/tenantservice/api/converter/TenantConverter.java
index 8cbc0d2..c950341 100644
--- a/src/main/java/com/vi/tenantservice/api/converter/TenantConverter.java
+++ b/src/main/java/com/vi/tenantservice/api/converter/TenantConverter.java
@@ -143,6 +143,12 @@ public RestrictedTenantDTO toRestrictedTenantDTO(TenantEntity tenant) {
         .settings(getSettings(tenant));
   }
 
+  public RestrictedTenantDTO toRestrictedTenantDTOinAuthorisedContext(TenantEntity mainTenant, TenantEntity tenantFromAuthorisedContext) {
+    RestrictedTenantDTO restrictedTenantDTO = toRestrictedTenantDTO(mainTenant);
+    restrictedTenantDTO.getContent().setPrivacy(tenantFromAuthorisedContext.getContentPrivacy());
+    return restrictedTenantDTO;
+  }
+
   public BasicTenantLicensingDTO toBasicLicensingTenantDTO(TenantEntity tenant) {
     var basicTenantLicensingDTO = new BasicTenantLicensingDTO()
         .id(tenant.getId())
diff --git a/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java b/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java
index 52b6887..f6bc60f 100644
--- a/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java
+++ b/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java
@@ -9,12 +9,15 @@
 import com.vi.tenantservice.api.model.TenantEntity;
 import com.vi.tenantservice.api.service.TenantService;
 import com.vi.tenantservice.api.validation.TenantInputSanitizer;
+import com.vi.tenantservice.config.security.AuthorisationService;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import javax.ws.rs.BadRequestException;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 /**
@@ -29,6 +32,10 @@ public class TenantServiceFacade {
   private final @NonNull TenantConverter tenantConverter;
   private final @NonNull TenantInputSanitizer tenantInputSanitizer;
   private final @NonNull TenantFacadeAuthorisationService tenantFacadeAuthorisationService;
+  private final @NonNull AuthorisationService authorisationService;
+
+  @Value("${feature.multitenancy.with.single.domain.enabled}")
+  private boolean multitenancyWithSingleDomain;
 
   public TenantDTO createTenant(TenantDTO tenantDTO) {
     log.info("Creating new tenant");
@@ -74,7 +81,7 @@ public Optional<RestrictedTenantDTO> findRestrictedTenantById(Long id) {
     return tenantById.isEmpty() ? Optional.empty()
         : Optional.of(tenantConverter.toRestrictedTenantDTO(tenantById.get()));
   }
-  
+
   public List<BasicTenantLicensingDTO> getAllTenants() {
     var tenantEntities = tenantService.getAllTenants();
     return tenantEntities.stream().map(tenantConverter::toBasicLicensingTenantDTO).collect(
@@ -83,10 +90,32 @@ public List<BasicTenantLicensingDTO> getAllTenants() {
 
   public Optional<RestrictedTenantDTO> findTenantBySubdomain(String subdomain) {
     var tenantById = tenantService.findTenantBySubdomain(subdomain);
+
+    if (multitenancyWithSingleDomain) {
+      return getSingleDomainSpecificTenantData(tenantById);
+    }
+
     return tenantById.isEmpty() ? Optional.empty()
         : Optional.of(tenantConverter.toRestrictedTenantDTO(tenantById.get()));
   }
 
+  public Optional<RestrictedTenantDTO> getSingleDomainSpecificTenantData(
+      Optional<TenantEntity> tenant) {
+    Optional<Long> accessTokenTenantId = authorisationService.findTenantIdInAccessToken();
+    if(accessTokenTenantId.isEmpty()){
+      if (accessTokenTenantId.isEmpty()) {
+        throw new BadRequestException("tenantId not found in access token");
+      }
+    }
+    Optional<TenantEntity> tenantFromAuthorisedContext = tenantService.findTenantById(accessTokenTenantId.get());
+    if (tenantFromAuthorisedContext.isEmpty()) {
+      throw new BadRequestException("Tenant not found for id " + accessTokenTenantId);
+    }
+    return Optional.of(tenantConverter
+        .toRestrictedTenantDTOinAuthorisedContext(tenant.get(),
+            tenantFromAuthorisedContext.get()));
+  }
+
   public Optional<RestrictedTenantDTO> getSingleTenant() {
     var tenantEntities = tenantService.getAllTenants();
     if (tenantEntities != null && tenantEntities.size() == 1) {
diff --git a/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java b/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java
index 145b991..2d0c40e 100644
--- a/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java
+++ b/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java
@@ -14,6 +14,7 @@
 import com.vi.tenantservice.api.model.TenantEntity;
 import com.vi.tenantservice.api.service.TenantService;
 import com.vi.tenantservice.api.validation.TenantInputSanitizer;
+import com.vi.tenantservice.config.security.AuthorisationService;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -23,6 +24,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.test.util.ReflectionTestUtils;
 
 @ExtendWith(MockitoExtension.class)
 class TenantServiceFacadeTest {
@@ -45,6 +47,9 @@ class TenantServiceFacadeTest {
   @Mock
   private TenantFacadeAuthorisationService tenantFacadeAuthorisationService;
 
+  @Mock
+  private AuthorisationService authorisationService;
+
   @InjectMocks
   private TenantServiceFacade tenantServiceFacade;
 
@@ -193,4 +198,24 @@ void getSingleTenant_Should_shouldThrowIllegalStateException_When_moreTenantsAre
     verify(tenantService).getAllTenants();
     verifyNoInteractions(converter);
   }
+
+  @Test
+  void findTenantBySubdomain_Should_tenantDataBasedOnTenantFromAccessToken_When_tenantIdPresentInToken(){
+    String subdomain = "app";
+    ReflectionTestUtils.setField(tenantServiceFacade,"multitenancyWithSingleDomain",true);
+    ReflectionTestUtils.setField(tenantServiceFacade,"tenantConverter",new TenantConverter());
+    TenantEntity defaultTenantEntity = new TenantEntity();
+    defaultTenantEntity.setContentPrivacy("content1");
+    Optional<TenantEntity> defaultTenant = Optional.of(defaultTenantEntity);
+    when(tenantService.findTenantBySubdomain(subdomain)).thenReturn(defaultTenant);
+    when(authorisationService.findTenantIdInAccessToken()).thenReturn(Optional.of(2L));
+    TenantEntity accessTokenTenant = new TenantEntity();
+    accessTokenTenant.setContentPrivacy("content2");
+    Optional<TenantEntity> accessTokenTenantData = Optional.of(accessTokenTenant);
+    when(tenantService.findTenantById(2L)).thenReturn(accessTokenTenantData);
+
+    Optional<RestrictedTenantDTO> tenantDTO = tenantServiceFacade.findTenantBySubdomain(subdomain);
+    assertThat(tenantDTO.get().getContent().getPrivacy()).contains("content2");
+
+  }
 }