diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
index 66415f2257e4..bec58cd6e805 100644
--- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
@@ -346,8 +346,11 @@ class SchemeManagerImpl<T : Scheme, MUTABLE_SCHEME : T>(val fileSpec: String,
         continue
       }
 
-      if (scheme === currentScheme) {
-        currentScheme = null
+      currentScheme?.let {
+        if (scheme === it) {
+          currentPendingSchemeName = it.name
+          currentScheme = null
+        }
       }
 
       iterator.remove()