diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
index fffdafc68f..6e55fd2ce3 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -343,11 +343,7 @@ public class WebServiceCore implements DBWServiceCore {
         }
 
         WebConnectionInfo connectionInfo = new WebConnectionInfo(webSession, newDataSource);
-        if (CommonUtils.equalObjects(sessionRegistry, WebServiceUtils.getGlobalRegistry(webSession))) {
-            sessionRegistry.flushConfig();
-        } else {
-            webSession.addConnection(connectionInfo);
-        }
+        webSession.addConnection(connectionInfo);
         webSession.addInfoMessage("New connection was created - " + WebServiceUtils.getConnectionContainerInfo(newDataSource));
         return connectionInfo;
     }
@@ -609,11 +605,7 @@ public class WebServiceCore implements DBWServiceCore {
                 registry.addDataSource(dataSourceContainer);
                 throw new DBWebException("Failed to delete connection", e);
             }
-            if (CommonUtils.equalObjects(registry, WebServiceUtils.getGlobalRegistry(webSession))) {
-                registry.flushConfig();
-            } else {
-                webSession.removeConnection(connectionInfo);
-            }
+            webSession.removeConnection(connectionInfo);
         } else {
             // Just reset saved credentials
             connectionInfo.clearSavedCredentials();