diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 25b94602..2207a6e1 100644
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -1450,7 +1450,11 @@ class ElectrumWindow(QMainWindow):
 
         try:
             cfg.set_key("proxy", { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) }, True)
-            wallet.set_server(server, cfg.config["proxy"])
+            if cfg.config["proxy"]["mode"] != "none":
+                wallet.set_server(server, cfg.config["proxy"])
+            else:
+                wallet.set_server(server)
+                
         except Exception as err:
             QMessageBox.information(None, _('Error'), str(err), _('OK'))
             if parent == None:
diff --git a/lib/wallet.py b/lib/wallet.py
index 06409d60..b2420508 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -347,7 +347,7 @@ class Wallet:
     def is_up_to_date(self):
         return self.interface.responses.empty() and not self.interface.unanswered_requests
 
-    def set_server(self, server, proxy):
+    def set_server(self, server, proxy=None):
         # raise an error if the format isnt correct
         a,b,c = server.split(':')
         b = int(b)