diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt
index 38def32301ef..12af3e7bf898 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationSchemeManager.kt
@@ -18,11 +18,14 @@ package com.intellij.execution.impl
 import com.intellij.configurationStore.LazySchemeProcessor
 import com.intellij.configurationStore.SchemeContentChangedHandler
 import com.intellij.configurationStore.SchemeDataHolder
+import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.util.InvalidDataException
 import com.intellij.util.attribute
 import org.jdom.Element
 import java.util.function.Function
 
+private val LOG = logger<RunConfigurationSchemeManager>()
+
 internal class RunConfigurationSchemeManager(private val manager: RunManagerImpl, private val isShared: Boolean) :
   LazySchemeProcessor<RunnerAndConfigurationSettingsImpl, RunnerAndConfigurationSettingsImpl>(), SchemeContentChangedHandler<RunnerAndConfigurationSettingsImpl> {
   override fun createScheme(dataHolder: SchemeDataHolder<RunnerAndConfigurationSettingsImpl>, name: String, attributeProvider: Function<String, String?>, isBundled: Boolean): RunnerAndConfigurationSettingsImpl {
@@ -34,8 +37,6 @@ internal class RunConfigurationSchemeManager(private val manager: RunManagerImpl
 
   private fun readData(settings: RunnerAndConfigurationSettingsImpl, dataHolder: SchemeDataHolder<RunnerAndConfigurationSettingsImpl>): Element {
     var element = dataHolder.read()
-    // very important to not write file with only changed line separators.
-    dataHolder.updateDigest(element)
 
     if (isShared && element.name == "component") {
       element = element.getChild("configuration")
@@ -47,6 +48,18 @@ internal class RunConfigurationSchemeManager(private val manager: RunManagerImpl
     catch (e: InvalidDataException) {
       RunManagerImpl.LOG.error(e)
     }
+
+    var elementAfterStateLoaded = element
+    try {
+      elementAfterStateLoaded = writeScheme(settings)
+    }
+    catch (e: Throwable) {
+      LOG.error("Cannot compute digest for RC using state after load", e)
+    }
+
+    // very important to not write file with only changed line separators
+    dataHolder.updateDigest(elementAfterStateLoaded)
+
     return element
   }