diff --git a/Mage.Client/src/main/java/mage/client/remote/Session.java b/Mage.Client/src/main/java/mage/client/remote/Session.java
index f12d278d599..f8538142f42 100644
--- a/Mage.Client/src/main/java/mage/client/remote/Session.java
+++ b/Mage.Client/src/main/java/mage/client/remote/Session.java
@@ -102,6 +102,13 @@ public class Session {
 			System.setSecurityManager(null);
 			System.setProperty("http.nonProxyHosts", "code.google.com");
 			System.setProperty("socksNonProxyHosts", "code.google.com");
+
+			// clear previous values
+			System.clearProperty("socksProxyHost");
+			System.clearProperty("socksProxyPort");
+			System.clearProperty("http.proxyHost");
+			System.clearProperty("http.proxyPort");
+
 			switch (connection.getProxyType()) {
 				case SOCKS:
 					System.setProperty("socksProxyHost", connection.getProxyHost());
@@ -112,12 +119,6 @@ public class Session {
 					System.setProperty("http.proxyPort", Integer.toString(connection.getProxyPort()));
 					Authenticator.setDefault(new MageAuthenticator(connection.getProxyUsername(), connection.getProxyPassword()));
 					break;
-				default:
-					System.clearProperty("socksProxyHost");
-					System.clearProperty("socksProxyPort");
-					System.clearProperty("http.proxyHost");
-					System.clearProperty("http.proxyPort");
-					break;
 			}
 			Registry reg = LocateRegistry.getRegistry(connection.getHost(), connection.getPort());
 			this.server = (Server) reg.lookup(Config.remoteServer);