diff --git a/cumulus_lambda_functions/lib/uds_db/granules_db_index.py b/cumulus_lambda_functions/lib/uds_db/granules_db_index.py
index c63fb07..9dd2305 100644
--- a/cumulus_lambda_functions/lib/uds_db/granules_db_index.py
+++ b/cumulus_lambda_functions/lib/uds_db/granules_db_index.py
@@ -234,14 +234,6 @@ def add_entry(self, tenant: str, tenant_venue: str, json_body: dict, doc_id: str
         LOGGER.debug(f'custom_metadata indexed')
         return
 
-    def get_size(self, tenant: str, tenant_venue: str, search_dsl: dict):
-        read_alias_name = f'{DBConstants.granules_read_alias_prefix}_{tenant}_{tenant_venue}'.lower().strip()
-        search_dsl['size'] = 0
-        search_dsl['track_total_hits'] = True
-        search_result = self.__es.query(search_dsl, querying_index=read_alias_name)
-        result_size = self.__es.get_result_size(search_result)
-        return result_size
-
     def dsl_search(self, tenant: str, tenant_venue: str, search_dsl: dict):
         read_alias_name = f'{DBConstants.granules_read_alias_prefix}_{tenant}_{tenant_venue}'.lower().strip()
         if 'sort' not in search_dsl:  # We cannot paginate w/o sort. So, max is 10k items:
diff --git a/cumulus_lambda_functions/uds_api/dapa/granules_dapa_query_es.py b/cumulus_lambda_functions/uds_api/dapa/granules_dapa_query_es.py
index 3bbb6c0..706c807 100644
--- a/cumulus_lambda_functions/uds_api/dapa/granules_dapa_query_es.py
+++ b/cumulus_lambda_functions/uds_api/dapa/granules_dapa_query_es.py
@@ -39,7 +39,7 @@ def __generate_es_dsl(self):
         if self.__filter_input is not None:
             query_terms.append(CqlParser('properties').transform(self.__filter_input))
         query_dsl = {
-            'track_total_hits': False,
+            'track_total_hits': self.__offset is None,
             'size': self.__limit,
             # "collapse": {"field": "id"},
             'sort': [
@@ -232,7 +232,7 @@ def start(self):
             return {
                 'statusCode': 200,
                 'body': {
-                    'numberMatched': {'total_size': result_size},
+                    'numberMatched': {'total_size': -1 if self.__offset is not None else result_size},
                     'numberReturned': len(granules_query_result['hits']['hits']),
                     'stac_version': '1.0.0',
                     'type': 'FeatureCollection',  # TODO correct name?