diff --git a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
index 65d3b0cc7d..6cf5010d03 100644
--- a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
+++ b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
@@ -152,6 +152,9 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
                     } else if (isDocument())
                     {
                         objecVariant = CMISObjectVariant.CURRENT_VERSION;
+                        objectId = currentNodeId + CMISConnector.ID_SEPERATOR + CMISConnector.UNVERSIONED_VERSION_LABEL;
+                        versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
+                        currentObjectId = objectId;
                         hasPWC = (connector.getLockService().getLockType(nodeRef) == LockType.READ_ONLY_LOCK);
                     } else
                     {