diff --git a/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java b/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
index 05ce4dc4b3..0892cb3684 100644
--- a/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
+++ b/source/java/org/alfresco/filesys/alfresco/AlfrescoContext.java
@@ -424,7 +424,7 @@ public abstract class AlfrescoContext extends DiskDeviceContext
     }
     
     public LockManager getLockManager() {
-        return null;
+        return lockManager;
     }
     
     OpLockManager opLockManager;