diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java
index 1bd022d..3b7ca4e 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClientCache.java
@@ -54,11 +54,11 @@ public class EsClientCache {
                             numberOfUsersForSameClient++;
                         }
                     }
-                    if(numberOfUsersForSameClient <= 1){
+                    if(numberOfUsersForSameClient == 0){
                         clientToRemove.shutdown();
                         log.info("Closed elasticsearch client for tenant {}", removal.getKey());
                     } else {
-                        log.info("Keeping client open from {} because it is still used by {} other tenants", removal.getKey(), numberOfUsersForSameClient - 1);
+                        log.info("Keeping client open from {} because it is still used by {} other tenants", removal.getKey(), numberOfUsersForSameClient);
                     }
 
                 })
diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java
index 878f39f..4e1aeeb 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClientCache.java
@@ -54,11 +54,11 @@ public class OpensearchClientCache {
                             numberOfUsersForSameClient++;
                         }
                     }
-                    if(numberOfUsersForSameClient <= 1){
+                    if(numberOfUsersForSameClient == 0){
                         clientToRemove.shutdown();
                         log.info("Closed elasticsearch client for tenant {}", removal.getKey());
                     } else {
-                        log.info("Keeping client open from {} because it is still used by {} other tenants", removal.getKey(), numberOfUsersForSameClient - 1);
+                        log.info("Keeping client open from {} because it is still used by {} other tenants", removal.getKey(), numberOfUsersForSameClient);
                     }
 
                 })