diff --git a/gui/network_dialog.py b/gui/network_dialog.py
index 6048a165..dfac40d3 100644
--- a/gui/network_dialog.py
+++ b/gui/network_dialog.py
@@ -211,7 +211,10 @@ class NetworkDialog(QDialog):
 
     def do_exec(self):
 
-        if not self.exec_(): return
+        if not self.exec_():
+            self.config.set_key("server", None, True)
+            self.config.set_key('auto_cycle', False, True)
+            return
 
         server = ':'.join([str( self.server_host.text() ),
                            str( self.server_port.text() ),
diff --git a/lib/interface.py b/lib/interface.py
index e16c0434..9ae713aa 100644
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -433,6 +433,10 @@ class Interface(threading.Thread):
         self.bytes_received = 0
         self.is_connected = False
 
+        # init with None server, in case we are offline 
+        self.init_server(None, None)
+
+
 
 
     def init_interface(self):