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 904e5ac3d7..24e3d37371 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -241,7 +241,9 @@ public class WebServiceUtils {
         dataSourceContainer.setSavePassword(saveCredentials);
         if (!saveCredentials) {
             // Reset credentials
-            //authProperties = new LinkedHashMap<>();
+            if (authProperties == null) {
+                authProperties = new LinkedHashMap<>();
+            }
         } else {
             if (authProperties == null) {
                 // No changes