1 files changed, 9 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index 2d39f760e..048287faa 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -130,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Connect
             UpdateConnectInfo();
         }
 
-        private async void UpdateConnectInfo()
+        private async Task UpdateConnectInfo()
         {
             await _operationLock.WaitAsync().ConfigureAwait(false);
 
@@ -400,6 +400,10 @@ namespace MediaBrowser.Server.Implementations.Connect
             }
             if (string.IsNullOrWhiteSpace(ConnectServerId))
             {
+                await UpdateConnectInfo().ConfigureAwait(false);
+            }
+            if (string.IsNullOrWhiteSpace(ConnectServerId))
+            {
                 throw new ArgumentNullException("ConnectServerId");
             }
 
@@ -493,6 +497,10 @@ namespace MediaBrowser.Server.Implementations.Connect
             }
             if (string.IsNullOrWhiteSpace(ConnectServerId))
             {
+                await UpdateConnectInfo().ConfigureAwait(false);
+            }
+            if (string.IsNullOrWhiteSpace(ConnectServerId))
+            {
                 throw new ArgumentNullException("ConnectServerId");
             }