diff --git a/TGS.ControlPanel/InstanceSelector.cs b/TGS.ControlPanel/InstanceSelector.cs
index 0d8a606d74..066fb9c6a9 100644
--- a/TGS.ControlPanel/InstanceSelector.cs
+++ b/TGS.ControlPanel/InstanceSelector.cs
@@ -100,7 +100,7 @@ namespace TGS.ControlPanel
 				activeCP.BringToFront();
 				return;
 			}
-			var InstanceAccessor = new ServerInterface(masterInterface.LoginInfo);
+			var InstanceAccessor = masterInterface.IsRemoteConnection ? new ServerInterface(masterInterface.LoginInfo) : new ServerInterface();
 			try
 			{
 				ConnectivityLevel res = ConnectivityLevel.None;