diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
index 4f306664b..24b063e65 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
@@ -135,9 +135,16 @@ public class TenantManagementService {
     private void validateJdbcUrl(String jdbcUrl) {
         // just create a URI object to check if the string is a valid URI
         new URI(jdbcUrl);
-        // same as above but with a URL object
+//        // same as above but with a URL object
         try {
-            new URL(jdbcUrl);
+            String startExpr = "jdbc:postgresql://";
+            if (!jdbcUrl.startsWith("")) {
+                throw new IllegalArgumentException("Your jdbcUrl is not URL conform.");
+            }
+
+            String afterStartExpr = jdbcUrl.substring(jdbcUrl.indexOf("//")).substring(2);
+            new URL(jdbcUrl.substring(jdbcUrl.indexOf(afterStartExpr)));
+
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException("Your jdbcUrl is not URL conform.", e);
         }