1 files changed, 5 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index b84942643..e20b12d1a 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -60,7 +60,6 @@ namespace Tango.Integration.ExternalBridge
         public ExternalBridgeScanner()
         {
             _settings = SettingsManager.Default.GetOrCreate<IntegrationSettings>();
-            _server = new UdpClient(_settings.ExternalBridgeServiceDiscoveryPort);
             AvailableMachines = new SynchronizedObservableCollection<IExternalBridgeClient>();
         }
 
@@ -73,6 +72,11 @@ namespace Tango.Integration.ExternalBridge
             {
                 LogManager.Log("External bridge scanner started...");
 
+                if (_server == null)
+                {
+                    _server = new UdpClient(_settings.ExternalBridgeServiceDiscoveryPort);
+                }
+
                 IsStarted = true;
 
                 foreach (var machine in AvailableMachines.OfType<ExternalBridgeTcpClient>().ToList())