diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
index 8a61caf5a712077898b50c842b6750b2cb737c72..b464540e1308a2514b3fc4d6aeb669cc91c0e3e9 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageNetwork.java
@@ -177,15 +177,19 @@ public class ConnectionPageNetwork extends ActiveWizardPage<ConnectionWizard> {
 
     void saveConfigurations(DataSourceDescriptor dataSource)
     {
+        boolean foundHandlers = false;
         java.util.List<DBWHandlerConfiguration> handlers = new ArrayList<DBWHandlerConfiguration>();
         for (HandlerBlock handlerBlock : configurations.values()) {
             DBWHandlerConfiguration configuration = handlerBlock.loadedConfigs.get(dataSource.getId());
             if (configuration != null) {
+                foundHandlers = true;
                 handlerBlock.configurator.saveSettings(configuration);
                 handlers.add(configuration);
             }
         }
-        dataSource.getConnectionInfo().setHandlers(handlers);
+        if (foundHandlers) {
+            dataSource.getConnectionInfo().setHandlers(handlers);
+        }
     }
 
 }