diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/MidlewareTunnel.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/MidlewareTunnel.java
index ce3aba59726486a685b2b320ab9d70ec34078e5d..ab3b862123c6997f5a01c6c8f17b8085535d57b4 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/MidlewareTunnel.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/MidlewareTunnel.java
@@ -106,6 +106,9 @@ class MidlewareTunnel implements Closeable {
 						break;
 					}
 				}
+				if(lastConnection != null) {
+					lastConnection.finishIfNeeded();
+				}
 			} finally {
 				if (log.isDebugEnabled()) {
 					log.debug("MiddlewareTunnel - interrupted");