diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java
index bbdeae8e2..f3f846edc 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java
@@ -12,7 +12,6 @@ import java.sql.DriverManager;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -87,8 +86,6 @@ public class TenantManagementService {
     private final GeneralConfigurationService generalConfigurationService;
     private final KeyCloakRoleManagerService keyCloakRoleManagerService;
     private final KeyCloakAdminClientService keycloak;
-    private final Map<String, String> tenantsHostAndSchemaMap = new HashMap<>();
-
 
     public TenantManagementService(EncryptionDecryptionService encryptionService,
                                    @Qualifier("tenantLiquibaseProperties") LiquibaseProperties liquibaseProperties,
@@ -203,16 +200,8 @@ public class TenantManagementService {
     }
 
 
-    private void checkDuplicateHostAndSchema(String hostAndSchemaName) {
-
-        if (tenantsHostAndSchemaMap.containsValue(hostAndSchemaName)) {
-            throw ConflictException.withObjectName("host and schema");
-        }
-    }
-
     private void createSchema(TenantRequest tenantRequest) {
 
-        checkDuplicateHostAndSchema(buildHostAndSchemaName(tenantRequest.getDatabaseConnection()));
         var jdbcUrl = JDBCUtils.buildJdbcUrl(tenantRequest.getDatabaseConnection());
         try (Connection connection = DriverManager.getConnection(jdbcUrl,
                 tenantRequest.getDatabaseConnection().getUsername(),
@@ -222,20 +211,11 @@ public class TenantManagementService {
             jdbcTemplate.execute((StatementCallback<Boolean>) stmt -> stmt.execute("CREATE SCHEMA " + tenantRequest.getDatabaseConnection().getSchema()));
             jdbcTemplate.execute((StatementCallback<Boolean>) stmt -> stmt.execute("GRANT USAGE ON SCHEMA " + tenantRequest.getDatabaseConnection()
                     .getSchema() + " TO " + tenantRequest.getDatabaseConnection().getUsername()));
-
-            tenantsHostAndSchemaMap.put(tenantRequest.getTenantId(), buildHostAndSchemaName(tenantRequest.getDatabaseConnection()));
         } catch (Exception e) {
             log.info("Could not create schema, ignoring");
         }
     }
 
-    private String buildHostAndSchemaName(DatabaseConnection databaseConnection) {
-        StringBuilder sb = new StringBuilder(databaseConnection.getHost())
-                .append("currentSchema=")
-                .append(databaseConnection.getSchema());
-        return sb.toString();
-    }
-
 
     private boolean tryToAccessRealm(String tenantId) {
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TenantsTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TenantsTest.java
index 3dcfe9642..229f1bba1 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TenantsTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TenantsTest.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -30,6 +31,8 @@ public class TenantsTest extends AbstractPersistenceServerServiceTest {
     @Test
     public void testCreateTenantWithSameHostAndSchema() {
 
+        TenantResponse firstTenant = tenantsClient.getTenants().get(0);
+
         var tenantRequest = TenantRequest.builder()
                 .tenantId("redaction2")
                 .displayName("Redaction default2")
@@ -37,7 +40,7 @@ public class TenantsTest extends AbstractPersistenceServerServiceTest {
                 .databaseConnection(DatabaseConnection.builder()
                         .driver("postgresql")
                         .host("localhost")
-                        .port("port")
+                        .port(firstTenant.getDatabaseConnection().getPort())
                         .database("redaction")
                         .schema("myschema")
                         .username("redaction")
@@ -64,11 +67,15 @@ public class TenantsTest extends AbstractPersistenceServerServiceTest {
                         RedUser.builder().username("manageradmin2@test.com").password("secret").redRoles(ApplicationRoles.ROLE_DATA.keySet()).build()))
                 .build();
 
-        try {
+        Exception exception = Assertions.assertThrows(FeignException.Conflict.class, () -> {
             tenantsClient.createTenant(tenantRequest);
-        } catch(FeignException e) {
-            assertThat(e.status()).isEqualTo(409);
-        }
+        });
+
+        String expectedMessage = "An object of type tenant already exists";
+        String actualMessage = exception.getMessage();
+
+        assertThat(actualMessage).contains(expectedMessage);
+
     }
 
     @Test
@@ -110,11 +117,14 @@ public class TenantsTest extends AbstractPersistenceServerServiceTest {
                         RedUser.builder().username("manageradmin2@test.com").password("secret").redRoles(ApplicationRoles.ROLE_DATA.keySet()).build()))
                 .build();
 
-        try {
+        Exception exception = Assertions.assertThrows(FeignException.Conflict.class, () -> {
             tenantsClient.createTenant(tenantRequest);
-        } catch(FeignException e) {
-            assertThat(e.status()).isEqualTo(409);
-        }
+        });
+
+        String expectedMessage = "An object of type tenant already exists";
+        String actualMessage = exception.getMessage();
+
+        assertThat(actualMessage).contains(expectedMessage);
     }
 
     @Test
@@ -185,10 +195,13 @@ public class TenantsTest extends AbstractPersistenceServerServiceTest {
                         RedUser.builder().username("manageradmin2@test.com").password("secret").redRoles(ApplicationRoles.ROLE_DATA.keySet()).build()))
                 .build();
 
-        try {
-        tenantsClient.createTenant(tenantRequest2);
-        } catch(FeignException e) {
-            assertThat(e.status()).isEqualTo(409);
-        }
+        Exception exception = Assertions.assertThrows(FeignException.Conflict.class, () -> {
+            tenantsClient.createTenant(tenantRequest);
+        });
+
+        String expectedMessage = "An object of type tenant already exists";
+        String actualMessage = exception.getMessage();
+
+        assertThat(actualMessage).contains(expectedMessage);
     }
 }