diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
index b6cf9883e79b55b240533007eba923149f5bf41d..dc115594db83b7c03c59c03632ed2a65fb08bd7b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
@@ -668,8 +668,6 @@ public class DataSourceDescriptor
         }
         log.debug("Connect with '" + getName() + "' (" + getId() + ")");
 
-        connecting = true;
-
         final String oldName = getConnectionConfiguration().getUserName();
         final String oldPassword = getConnectionConfiguration().getUserPassword();
         if (!isSavePassword()) {
@@ -690,6 +688,7 @@ public class DataSourceDescriptor
 
         processEvents(monitor, DBPConnectionEventType.BEFORE_CONNECT);
 
+        connecting = true;
         tunnelConnectionInfo = null;
         try {
             // Handle tunnel