diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
index 58d1845..d822457 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
@@ -120,7 +120,7 @@ public class TenantManagementService implements TenantProvider {
                                 .password(encryptionService.encrypt(tenantRequest.getSearchConnection().getPassword()))
                                 .numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards())
                                 .numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas())
-                                .indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
+                                .indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
                                 .build())
                         .build();
 
@@ -416,7 +416,7 @@ public class TenantManagementService implements TenantProvider {
                         .password(encryptionService.encrypt(searchConnection.getPassword()))
                         .numberOfShards(searchConnection.getNumberOfShards())
                         .numberOfReplicas(searchConnection.getNumberOfReplicas())
-                        .indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
+                        .indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
                         .build());
             }