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 8460555c30bf..37eab3ad9833 100644
--- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfiguration.java
@@ -46,8 +46,8 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
   @Override
   public void writeExternal(final Element element) throws WriteExternalException {
     super.writeExternal(element);
-    final Module module = getConfigurationModule().getModule();
-    if (module != null) { // default value
+    final String moduleName = getConfigurationModule().getModuleName();
+    if (moduleName != null) { // default value
       writeModule(element);
     }
     DefaultJDOMExternalizer.writeExternal(this, element);