diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
index b9ac4715f4..441cc9f9ec 100644
--- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
@@ -4321,7 +4321,7 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
                         "   Value: " + value);
             }
             // Handle ContentData
-            if (value instanceof ContentData)
+            if (value instanceof ContentData && propertyTypeQName.equals(DataTypeDefinition.CONTENT))
             {
                 // Needs converting to an ID
                 ContentData contentData = (ContentData) value;