diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java b/source/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
index 8b9bdac749..b638696a3b 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -80,7 +80,7 @@ public class SolrCategoryServiceImpl extends LuceneCategoryServiceImpl
         sp.addStore(storeRef);
         sp.setQuery(catProperty+":*");
         FieldFacet ff = new FieldFacet(field);
-        ff.setLimit(count);
+        ff.setLimitOrNull(count);
         sp.addFieldFacet(ff);
         
         ResultSet resultSet = null;
diff --git a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
index 29fc753cf2..8287de9291 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
@@ -447,7 +447,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
                         url.append("&").append(encoder.encode("f."+facet.getField()+".facet.enum.cache.minDf", "UTF-8")).append("=").append(encoder.encode(""+facet.getEnumMethodCacheMinDF(), "UTF-8"));
                     }
                     int facetLimit;
-                    if(facet.getLimit() == null)
+                    if(facet.getLimitOrNull() == null)
                     {
                         if(mapping.isSharded())
                         {
@@ -460,7 +460,7 @@ public class SolrQueryHTTPClient implements BeanFactoryAware
                     }
                     else
                     {
-                        facetLimit = facet.getLimit().intValue();
+                        facetLimit = facet.getLimitOrNull().intValue();
                     }
                     url.append("&").append(encoder.encode("f."+facet.getField()+".facet.limit", "UTF-8")).append("=").append(encoder.encode(""+facetLimit, "UTF-8"));
                     if(facet.getMethod() != null)