diff --git a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
index eb22ce5288..691b121ff9 100644
--- a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
+++ b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
@@ -201,7 +201,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
             QName destinationAssocQName) 
     {
     	LockType lockType = this.lockService.getLockType(nodeRef);
-    	if (LockType.READ_ONLY_LOCK.equals(lockType) == true)
+        if (LockType.READ_ONLY_LOCK.equals(lockType) == true || getWorkingCopy(nodeRef) != null)
     	{
     		throw new CheckOutCheckInServiceException(MSG_ALREADY_CHECKEDOUT);
     	}