diff --git a/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java b/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
index bc21cc6455077de76492eef39ab3edd6952d9a5b..03f145489553ce255b2dfa3ccf793b317b66c753 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
+++ b/plugins/org.jkiss.dbeaver.net.ssh/src/org/jkiss/dbeaver/model/net/ssh/SSHTunnelImpl.java
@@ -126,7 +126,12 @@ public class SSHTunnelImpl implements DBWTunnel {
                 try {
                     implementation.invalidateTunnel(monitor1);
                 } catch (Exception e) {
-                    log.debug("Error invalidating SSH tunnel", e);
+                    log.debug("Error invalidating SSH tunnel. Closing.", e);
+                    try {
+                        closeTunnel(monitor);
+                    } catch (Exception e1) {
+                        log.error("Error closing broken tunnel", e1);
+                    }
                 }
             },
             "Ping SSH tunnel " + dataSource.getContainer().getName(),