diff --git a/XIONControlPanel/Controllers/MainViewController.swift b/XIONControlPanel/Controllers/MainViewController.swift
index 7188d5c..b7c4fbc 100644
--- a/XIONControlPanel/Controllers/MainViewController.swift
+++ b/XIONControlPanel/Controllers/MainViewController.swift
@@ -89,13 +89,15 @@ class MainViewController: UIViewController, SwitchesViewControllerDelegate {
     {
         _headerView.xionLogoView.beginAnimating()
         
-        _updateConnectivityStatus(.Connecting)
-        _server.connect { (error: NSError?) -> Void in
-            if (error == nil) {
-                self._reloadDevices()
-                self._startUpdatingDevices()
-            } else {
-                self._updateConnectivityStatus(.Error)
+        if (!_server.connected) {
+            _updateConnectivityStatus(.Connecting)
+            _server.connect { (error: NSError?) -> Void in
+                if (error == nil) {
+                    self._reloadDevices()
+                    self._startUpdatingDevices()
+                } else {
+                    self._updateConnectivityStatus(.Error)
+                }
             }
         }
     }