diff --git a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
index 6cf5010d03..dd2a24f9f4 100644
--- a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
+++ b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java
@@ -781,13 +781,18 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
         {
             parents = new ArrayList<CMISNodeInfo>();
 
-            List<ChildAssociationRef> nodeParents = connector.getNodeService().getParentAssocs(nodeRef,
+            NodeRef nodeRefForParent = (isCurrentVersion() ? getCurrentNodeNodeRef() : nodeRef);
+
+            List<ChildAssociationRef> nodeParents = connector.getNodeService().getParentAssocs(nodeRefForParent,
                     ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
             if (nodeParents != null)
             {
                 for (ChildAssociationRef parent : nodeParents)
                 {
-                    parents.add(new CMISNodeInfoImpl(connector, parent.getParentRef()));
+                    if (connector.getType(parent.getParentRef()) instanceof FolderTypeDefintionWrapper)
+                    {
+                        parents.add(new CMISNodeInfoImpl(connector, parent.getParentRef()));
+                    }
                 }
             }
         }