diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
index c4e70e364401..453067da633c 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
@@ -53,7 +53,9 @@ public abstract class JavaCommandLineState extends CommandLineState implements J
 
   protected GeneralCommandLine createCommandLine() throws ExecutionException {
     SimpleJavaParameters javaParameters = getJavaParameters();
-    javaParameters.setUseDynamicClasspath(getEnvironment().getProject());
+    if (!javaParameters.isDynamicClasspath()) {
+      javaParameters.setUseDynamicClasspath(getEnvironment().getProject());
+    }
     return javaParameters.toCommandLine();
   }