diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
index 11793023a5..77395d7c09 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -217,6 +217,9 @@ private static void setMainProperties(DBPConnectionConfiguration dsConfig, WebCo
         }
         if (config.getMainPropertyValues() != null) {
             for (Map.Entry<String, Object> e : config.getMainPropertyValues().entrySet()) {
+                if (e.getValue() == null) {
+                    continue;
+                }
                 switch (e.getKey()) {
                     case DBConstants.PROP_HOST -> dsConfig.setHostName(CommonUtils.toString(e.getValue()));
                     case DBConstants.PROP_PORT -> dsConfig.setHostPort(CommonUtils.toString(e.getValue()));