diff --git a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
index 472503d174..727627a5a4 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml
@@ -549,10 +549,10 @@
          org.alfresco.repo.domain.hibernate.NodeImpl as node
          join node.properties prop
       where
-         index(prop) = :propQName and
-         prop.stringValue = :propStringValue and
-         node.store.key.protocol = :protocol and
-         node.store.key.identifier = :identifier
+         node.store.key.protocol = :protocol and
+         node.store.key.identifier = :identifier and
+         index(prop) = :propQNameId and
+         prop.stringValue = :propStringValue
    </query>
    
 </hibernate-mapping>