diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
index 065af49..41b2468 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
@@ -306,7 +306,7 @@ public class ClusterNodeInfo {
      * lease check - hence there's a system property that does that:
      * oak.documentMK.disableLeaseCheck
      */
-    private final boolean leaseCheckDisabled;
+    private boolean leaseCheckDisabled;
 
     /**
      * Tracks the fact whether the lease has *ever* been renewed by this instance
@@ -350,6 +350,10 @@ public class ClusterNodeInfo {
         this.leaseCheckDisabled = Boolean.valueOf(System.getProperty("oak.documentMK.disableLeaseCheck", "false"));
     }
 
+    public void setLeaseCheckDisabled(boolean leaseCheckDisabled) {
+        this.leaseCheckDisabled = leaseCheckDisabled;
+    }
+    
     public int getId() {
         return id;
     }
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index 59b6a3c..9e73339 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -454,6 +454,8 @@ public final class DocumentNodeStore
         if (builder.getLeaseCheck()) {
             s = new LeaseCheckDocumentStoreWrapper(s, clusterNodeInfo);
             clusterNodeInfo.setLeaseFailureHandler(builder.getLeaseFailureHandler());
+        } else {
+            clusterNodeInfo.setLeaseCheckDisabled(true);
         }
 
         this.store = s;