diff --git a/muon-app/src/main/java/muon/app/ssh/SshClient2.java b/muon-app/src/main/java/muon/app/ssh/SshClient2.java
index 6b30c3fb..5d946916 100644
--- a/muon-app/src/main/java/muon/app/ssh/SshClient2.java
+++ b/muon-app/src/main/java/muon/app/ssh/SshClient2.java
@@ -51,6 +51,8 @@ public class SshClient2 implements Closeable {
 	private SshClient2 previousHop;
 	private ServerSocket ss;
 
+	//30000 ms
+	private static final int CONNECTION_TIMEOUT = 30000;
 	/**
 	 * O
 	 * 
@@ -177,7 +179,8 @@ private void connect(Deque<HopEntry> hopStack) throws IOException, OperationCanc
 		this.inputBlocker.blockInput();
 		try {
 			sshj = new SSHClient();
-
+			sshj.setConnectTimeout(CONNECTION_TIMEOUT);
+			sshj.setTimeout(CONNECTION_TIMEOUT);
 			if (hopStack.isEmpty()) {
 				this.setupProxyAndSocketFactory();
 				this.sshj.addHostKeyVerifier(App.HOST_KEY_VERIFIER);