diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOpenmrsObjectDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOpenmrsObjectDAO.java
index 1901fd78e550..c0a786b18a6f 100644
--- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOpenmrsObjectDAO.java
+++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOpenmrsObjectDAO.java
@@ -11,9 +11,7 @@
 
 import java.io.Serializable;
 
-import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
-import org.hibernate.criterion.Restrictions;
 import org.openmrs.BaseOpenmrsObject;
 import org.openmrs.api.db.OpenmrsObjectDAO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +43,10 @@ public T getById(Serializable id) {
 	 */
 	@Override
 	public T getByUuid(String uuid) {
-		Criteria crit = sessionFactory.getCurrentSession().createCriteria(mappedClass);
-		return (T) crit.add(Restrictions.eq("uuid", uuid)).uniqueResult();
+		return HibernateUtil.getUniqueEntityByUUID(sessionFactory, mappedClass, uuid);
 	}
-	
+
+
 	/** 
 	 * @see org.openmrs.api.db.OpenmrsObjectDAO#delete(org.openmrs.BaseOpenmrsObject)
 	 */