diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index dd6bda0437..26a99acf14 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -1830,8 +1830,10 @@ public <T> List<T> find(Name base, Filter filter, SearchControls searchControls,
         }
 
         // extend search controls with the attributes to return
-        String[] attributes = odm.manageClass(clazz);
-        searchControls.setReturningAttributes(attributes);
+	if (isNotCustomReturningAttributes(searchControls)) {
+            String[] attributes = this.odm.manageClass(clazz);
+            searchControls.setReturningAttributes(attributes);
+        }
         
         if (LOG.isDebugEnabled()) {
             LOG.debug(String.format("Searching - base=%1$s, finalFilter=%2$s, scope=%3$s", base, finalFilter, searchControls));
@@ -1877,6 +1879,10 @@ else if (result.size() != 1) {
 
         return result.get(0);
     }
+	
+    private boolean isNotCustomReturningAttributes(SearchControls searchControls) {
+        return searchControls.getReturningAttributes() == null || searchControls.getReturningAttributes().length == 0;
+    }
 
 	/**
 	 * The status of an authentication attempt.