diff --git a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
index a1bfcc0890ea..08e3aa8893ce 100644
--- a/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
+++ b/platform/platform-impl/src/org/jetbrains/io/BuiltInServer.java
@@ -94,7 +94,7 @@ public class BuiltInServer implements Disposable {
         int customPortServerManagerPort = customPortServerManager.getPort();
         SubServer subServer = new SubServer(customPortServerManager, eventLoopGroup);
         Disposer.register(this, subServer);
-        if (customPortServerManagerPort != firstPort && customPortServerManagerPort != port) {
+        if (customPortServerManager.isAvailableExternally() || (customPortServerManagerPort != firstPort && customPortServerManagerPort != port)) {
           subServer.bind(customPortServerManagerPort);
         }
       }
diff --git a/platform/platform-impl/src/org/jetbrains/io/SubServer.java b/platform/platform-impl/src/org/jetbrains/io/SubServer.java
index 9f14762714b6..e5e35975116a 100644
--- a/platform/platform-impl/src/org/jetbrains/io/SubServer.java
+++ b/platform/platform-impl/src/org/jetbrains/io/SubServer.java
@@ -37,7 +37,7 @@ final class SubServer implements CustomPortServerManager.CustomPortService, Disp
   }
 
   public boolean bind(int port) {
-    if (port == BuiltInServerManager.getInstance().getPort()) {
+    if (!user.isAvailableExternally() && port == BuiltInServerManager.getInstance().getPort()) {
       return true;
     }