diff --git a/x-pack/plugins/uptime/common/constants/index.ts b/x-pack/plugins/uptime/common/constants/index.ts
index 72d498056d6b3..00baa39044a55 100644
--- a/x-pack/plugins/uptime/common/constants/index.ts
+++ b/x-pack/plugins/uptime/common/constants/index.ts
@@ -11,6 +11,6 @@ export { CONTEXT_DEFAULTS } from './context_defaults';
 export * from './capabilities';
 export * from './settings_defaults';
 export { PLUGIN } from './plugin';
-export { QUERY, STATES } from './query';
+export { QUERY } from './query';
 export * from './ui';
 export * from './rest_api';
diff --git a/x-pack/plugins/uptime/common/constants/query.ts b/x-pack/plugins/uptime/common/constants/query.ts
index d728f114aae76..21574f1d8b27e 100644
--- a/x-pack/plugins/uptime/common/constants/query.ts
+++ b/x-pack/plugins/uptime/common/constants/query.ts
@@ -25,10 +25,3 @@ export const QUERY = {
     'error.type',
   ],
 };
-
-export const STATES = {
-  // Number of results returned for a states query
-  LEGACY_STATES_QUERY_SIZE: 10,
-  // The maximum number of monitors that should be supported
-  MAX_MONITORS: 35000,
-};
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
index d21259fad77a6..8612d71dfe939 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
@@ -6,7 +6,7 @@
 
 import { get, sortBy } from 'lodash';
 import { QueryContext } from './query_context';
-import { QUERY, STATES } from '../../../../common/constants';
+import { QUERY } from '../../../../common/constants';
 import {
   Check,
   Histogram,
@@ -314,7 +314,7 @@ const getHistogramForMonitors = async (
         by_id: {
           terms: {
             field: 'monitor.id',
-            size: STATES.LEGACY_STATES_QUERY_SIZE,
+            size: queryContext.size,
           },
           aggs: {
             histogram: {