diff --git a/platform/configuration-store-impl/src/ApplicationStoreImpl.kt b/platform/configuration-store-impl/src/ApplicationStoreImpl.kt
index b5de60640b7d..0b7a18cceaf2 100644
--- a/platform/configuration-store-impl/src/ApplicationStoreImpl.kt
+++ b/platform/configuration-store-impl/src/ApplicationStoreImpl.kt
@@ -87,6 +87,10 @@ class ApplicationStorageManager(application: Application, pathMacroManager: Path
 
   override fun dataLoadedFromProvider(storage: FileBasedStorage, element: Element?) {
     // IDEA-144052 When "Settings repository" is enabled changes in 'Path Variables' aren't saved to default path.macros.xml file causing errors in build process
+    if (storage.fileSpec != "path.macros.xml") {
+      return
+    }
+
     LOG.catchAndLog {
       if (element == null) {
         storage.file.delete()
diff --git a/platform/configuration-store-impl/src/XmlElementStorage.kt b/platform/configuration-store-impl/src/XmlElementStorage.kt
index cfb928de1c0f..626c1dcb5c3f 100644
--- a/platform/configuration-store-impl/src/XmlElementStorage.kt
+++ b/platform/configuration-store-impl/src/XmlElementStorage.kt
@@ -29,7 +29,7 @@ import gnu.trove.THashMap
 import org.jdom.Attribute
 import org.jdom.Element
 
-abstract class XmlElementStorage protected constructor(protected val fileSpec: String,
+abstract class XmlElementStorage protected constructor(val fileSpec: String,
                                                        protected val rootElementName: String?,
                                                        protected val pathMacroSubstitutor: TrackingPathMacroSubstitutor? = null,
                                                        roamingType: RoamingType? = RoamingType.DEFAULT,