diff --git a/platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt b/platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt
index fe4299e25f02..cfd13cf1a3b7 100644
--- a/platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt
+++ b/platform/script-debugger/debugger-ui/src/RemoteVmConnection.kt
@@ -39,6 +39,7 @@ import javax.swing.JList
 
 abstract class RemoteVmConnection : VmConnection<Vm>() {
   var port = -1
+  var isLocalAddress = true
 
   private val connectCancelHandler = AtomicReference<() -> Unit>()
 
@@ -47,6 +48,7 @@ abstract class RemoteVmConnection : VmConnection<Vm>() {
   @JvmOverloads
   fun open(address: InetSocketAddress, stopCondition: Condition<Void>? = null): Promise<Vm> {
     port = address.port
+    isLocalAddress = address.getAddress().isAnyLocalAddress() || address.getAddress().isLoopbackAddress()
     setState(ConnectionStatus.WAITING_FOR_CONNECTION, "Connecting to ${address.hostName}:${port}")
     val result = AsyncPromise<Vm>()
     val future = ApplicationManager.getApplication().executeOnPooledThread {
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebuggableRunConfiguration.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebuggableRunConfiguration.java
index dadad5f64b31..1fdb027a16bd 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebuggableRunConfiguration.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/DebuggableRunConfiguration.java
@@ -19,6 +19,7 @@ import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunProfile;
+import com.intellij.execution.configurations.RunProfileState;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.util.net.NetUtils;
 import com.intellij.xdebugger.XDebugProcess;
@@ -32,7 +33,7 @@ import java.net.InetSocketAddress;
 
 public interface DebuggableRunConfiguration extends RunConfiguration {
   @NotNull
-  default InetSocketAddress computeDebugAddress() throws ExecutionException {
+  default InetSocketAddress computeDebugAddress(RunProfileState state) throws ExecutionException {
     try {
       return new InetSocketAddress(InetAddress.getLoopbackAddress(), NetUtils.findAvailableSocketPort());
     }
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java
index 3ffe0d6a022c..942a5c9b5138 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/RemoteDebugConfiguration.java
@@ -127,7 +127,7 @@ public abstract class RemoteDebugConfiguration extends LocatableConfigurationBas
 
   @NotNull
   @Override
-  public InetSocketAddress computeDebugAddress() {
+  public InetSocketAddress computeDebugAddress(RunProfileState state) {
     if (host == null) {
       return new InetSocketAddress(InetAddress.getLoopbackAddress(), port);
     }