diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index a8f9ca5a7a..bb778d18e3 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -1002,12 +1002,16 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
             @Override
             public boolean includeAuthority(String authority)
             {
-                String siteName = resolveSite(authority);
-                if (siteName == null)
+                if (siteNames.size() < maxResults)
                 {
-                    return false;
+                    String siteName = resolveSite(authority);
+                    if (siteName == null)
+                    {
+                        return false;
+                    }
+                    return siteNames.add(siteName);
                 }
-                return siteNames.add(siteName);
+                return false;
             }}, maxResults);
         if (siteNames.isEmpty())
         {