diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
index 42f3129835..f8ecf257b0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
@@ -194,7 +194,7 @@ import javax.security.auth.login.LoginException;
     params.put(LdapRealm.USERNAME, username);
 
     List<LdapQuery> accountQueryList;
-    if (fetchMemberOf) {
+    if (fetchMemberOf && schema.type.accountMemberField() != null) {
       accountQueryList = schema.accountWithMemberOfQueryList;
     } else {
       accountQueryList = schema.accountQueryList;