diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java
index e7564ff..1e4eaae 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/utils/IndexNameHelper.java
@@ -1,24 +1,16 @@
 package com.iqser.red.service.search.v1.server.utils;
 
-import com.knecon.fforesight.tenantcommons.TenantContext;
-
 import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
 
 @UtilityClass
-@Slf4j
 public class IndexNameHelper {
 
     private static final String SEARCH_INDEX = "%s_search";
 
 
     public String getSearchIndex(String indexPrefix) {
-        log.info("INDEX_PREFIX: {}", indexPrefix);
-        if(indexPrefix != null) {
-            return String.format(SEARCH_INDEX, indexPrefix);
-        } else {
-            return String.format(SEARCH_INDEX, TenantContext.getTenantId());
-        }
+
+        return String.format(SEARCH_INDEX, indexPrefix);
     }
 
 }