diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
index f4bc140b3875..49b3c8ee69b6 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStreamProviderFactory.kt
@@ -121,6 +121,7 @@ private fun createStorage(project: Project): PersistentHashMap<String, ByteArray
   })
 
   fun deleteFileAndWriteLatestFormatVersion() {
+    dir.deleteChildrenStartingWith(file.fileName.toString())
     file.delete()
     versionFile.outputStream().use { it.write(MODULE_FILE_FORMAT_VERSION) }
 
diff --git a/platform/projectModel-api/src/com/intellij/util/io/path.kt b/platform/projectModel-api/src/com/intellij/util/io/path.kt
index 8ce9d943ea5b..2035c8717a1d 100644
--- a/platform/projectModel-api/src/com/intellij/util/io/path.kt
+++ b/platform/projectModel-api/src/com/intellij/util/io/path.kt
@@ -98,6 +98,12 @@ fun Path.deleteWithParentsIfEmpty(root: Path, isFile: Boolean = true): Boolean {
   return true
 }
 
+fun Path.deleteChildrenStartingWith(prefix: String) {
+  directoryStreamIfExists({ it.fileName.toString().startsWith(prefix) }) { it.toList() }?.forEach {
+    it.delete()
+  }
+}
+
 private fun Path.deleteRecursively() = Files.walkFileTree(this, object : SimpleFileVisitor<Path>() {
   override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
     try {