diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php
index b6b71eda5..9a09c3664 100755
--- a/src/Forms/GridField/GridFieldFilterHeader.php
+++ b/src/Forms/GridField/GridFieldFilterHeader.php
@@ -186,7 +186,7 @@ class GridFieldFilterHeader extends AbstractGridFieldComponent implements GridFi
 
         $dataListClone = clone($dataList);
         $results = $this->getSearchContext($gridField)
-            ->getQuery($filterArguments, false, false, $dataListClone);
+            ->getQuery($filterArguments, false, null, $dataListClone);
 
         return $results;
     }
diff --git a/src/ORM/Search/SearchContext.php b/src/ORM/Search/SearchContext.php
index 3dae7058b..7df2b75e7 100644
--- a/src/ORM/Search/SearchContext.php
+++ b/src/ORM/Search/SearchContext.php
@@ -18,6 +18,7 @@ use SilverStripe\Forms\CheckboxField;
 use InvalidArgumentException;
 use Exception;
 use SilverStripe\Core\Config\Config;
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\DataQuery;
 
 /**
@@ -140,6 +141,13 @@ class SearchContext
      */
     public function getQuery($searchParams, $sort = false, $limit = false, $existingQuery = null)
     {
+        if ((count(func_get_args()) >= 3) && (!in_array(gettype($limit), ['array', 'NULL', 'string']))) {
+            Deprecation::notice(
+                '5.1.0',
+                '$limit should be type of array|string|null'
+            );
+            $limit = null;
+        }
         $this->setSearchParams($searchParams);
         $query = $this->prepareQuery($sort, $limit, $existingQuery);
         return $this->search($query);