diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
index c2393ad8821e..4bab60584ffd 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerRunner.java
@@ -106,6 +106,13 @@ public class GenericDebuggerRunner implements JvmPatchableProgramRunner<GenericD
 
   protected @Nullable RunContentDescriptor createContentDescriptor(@NotNull RunProfileState state,
                                                                    @NotNull ExecutionEnvironment environment) throws ExecutionException {
+    if (state instanceof RemoteConnectionCreator) {
+      RemoteConnection connection = ((RemoteConnectionCreator)state).createRemoteConnection(environment);
+      boolean isPollConnection = ((RemoteConnectionCreator)state).isPollConnection();
+      if (connection != null) {
+        return attachVirtualMachine(state, environment, connection, isPollConnection);
+      }
+    }
     if (state instanceof JavaCommandLine) {
       JavaParameters parameters = ((JavaCommandLine)state).getJavaParameters();
       boolean isPollConnection = true;