diff --git a/block-storage/src/main/java/org/lucares/pdb/map/PersistentMap.java b/block-storage/src/main/java/org/lucares/pdb/map/PersistentMap.java
index 655f000..ea23aee 100644
--- a/block-storage/src/main/java/org/lucares/pdb/map/PersistentMap.java
+++ b/block-storage/src/main/java/org/lucares/pdb/map/PersistentMap.java
@@ -100,6 +100,9 @@ public class PersistentMap<K, V> implements AutoCloseable {
 
         @Override
         public byte[] encode(final Long object) {
+            if (object == null) {
+                return new byte[0];
+            }
             return VariableByteEncoder.encode(object);
         }
 
@@ -703,7 +706,7 @@ public class PersistentMap<K, V> implements AutoCloseable {
         try {
             if (version < 1) {
                 reindex();
-            } else {
+            } else if (false) {
                 final String reindexProperty = System.getProperty("pdb.reindex", "false");
                 if (!isNew && (reindexProperty.equals("true")
                         || path.getParent().getFileName().toString().equals(reindexProperty))) {