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 433b7d05d3..194868d792 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -165,7 +165,9 @@ public class WebServiceUtils {
         setConnectionConfiguration(dataSource.getDriver(), dataSource.getConnectionConfiguration(), config);
         dataSource.setName(config.getName());
         dataSource.setDescription(config.getDescription());
-        initAuthProperties(dataSource, config.getCredentials());
+        if (config.isSaveCredentials()) {
+            initAuthProperties(dataSource, config.getCredentials());
+        }
         dataSource.setSavePassword(config.isSaveCredentials());
     }