diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
index 8cdd2b07169d..4c763838879a 100644
--- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
@@ -44,7 +44,10 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
 
   public void writeExternal(final Element element) throws WriteExternalException {
     super.writeExternal(element);
-    writeModule(element);
+    final Module module = getConfigurationModule().getModule();
+    if (module != null) { // default value
+      writeModule(element);
+    }
     DefaultJDOMExternalizer.writeExternal(this, element);
   }