diff --git a/source/java/org/alfresco/repo/lock/LockServiceImpl.java b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
index 66094d8585..9ae7dea6fb 100644
--- a/source/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -805,12 +805,14 @@ public class LockServiceImpl implements LockService,
     public void suspendLocks()
     {
        getBehaviourFilter().disableBehaviour(ContentModel.ASPECT_LOCKABLE);
+       lockableAspectInterceptor.disableForThread();
     }
     
     @Override
     public void enableLocks()
     {
        getBehaviourFilter().enableBehaviour(ContentModel.ASPECT_LOCKABLE);
+       lockableAspectInterceptor.enableForThread();
     }
 
     @Override