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 6706714e3887da1a6a451ea91da5b8124b54da03..62606bdc702aec2964b49b30664158efc0c5d9a6 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
@@ -712,6 +712,7 @@ public class DataSourceDescriptor
 */
 
                     if (preferenceStore.getBoolean(ModelPreferences.CONNECT_USE_ENV_VARS)) {
+                        tunnelConfiguration = new DBWHandlerConfiguration(tunnelConfiguration);
                         tunnelConfiguration.resolveSystemEnvironmentVariables();
                     }
                     tunnelConnectionInfo = tunnel.initializeTunnel(monitor, registry.getPlatform(), tunnelConfiguration, connectionInfo);