diff --git a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
index 786f4db9a4..11a50c1330 100644
--- a/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/SearchMapper.java
@@ -106,6 +106,8 @@ public class SearchMapper
     {
         //Hardcode workspace store
         sp.addStore(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
+        sp.setLimitBy(LimitBy.FINAL_SIZE);
+        sp.setMaxItems(100);
     }
 
     /**
diff --git a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
index 1cfdda9e2e..5b3d7ea740 100644
--- a/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
+++ b/source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
@@ -44,6 +44,7 @@ import org.alfresco.rest.api.search.model.Template;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.LimitBy;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.junit.Test;
 
@@ -75,6 +76,8 @@ public class SearchMapperTests
         //Test defaults
         assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size());
         assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0));
+        assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
+        assertEquals(100, searchParameters.getMaxItems());
 
         searchParameters = searchMapper.toSearchParameters(helper.searchQueryFromJson());
         assertNotNull(searchParameters);
@@ -141,6 +144,7 @@ public class SearchMapperTests
         SearchParameters searchParameters = new SearchParameters();
         //Doesn't error
         searchMapper.fromPaging(searchParameters, null);
+
         Paging paging = Paging.DEFAULT;
         searchMapper.fromPaging(searchParameters, paging);
         assertEquals(searchParameters.getMaxItems(),paging.getMaxItems());