diff --git a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
index d06d12e10472..ffb5e5934d3e 100644
--- a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
+++ b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
@@ -221,7 +221,7 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
         return NULL_ID;
       }
 
-      int indexNodeValueAddress = 0;
+      int indexNodeValueAddress = keyValue != null ? keyValue:0;
       int collisionAddress = NULL_ID;
 
       if (!myInlineKeysNoMapping) {
@@ -256,6 +256,8 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
         }
 
         if (!saveNewValue) return NULL_ID;
+      } else {
+        if (keyValue != null) return indexNodeValueAddress;
       }
 
       int newValueId = writeData(value, valueHC);  // TODO: we can store at Btree leaf index