diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
index 225f4ca109290..e453f777fbd50 100644
--- a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
@@ -69,8 +69,8 @@ describe('query builder', () => {
       });
       expect(query).toEqual({
         body: {
-          query: { match: { machine_id: mockID } },
-          sort: [{ created_at: { order: 'desc' } }],
+          query: { match: { 'host.id.keyword': mockID } },
+          sort: [{ 'event.created': { order: 'desc' } }],
           size: 1,
         },
         index: 'endpoint-agent*',
diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
index 88deed2500304..b4f295a64b6ea 100644
--- a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
@@ -74,12 +74,12 @@ export const kibanaRequestToEndpointFetchQuery = (
     body: {
       query: {
         match: {
-          machine_id: request.params.id,
+          'host.id.keyword': request.params.id,
         },
       },
       sort: [
         {
-          created_at: {
+          'event.created': {
             order: 'desc',
           },
         },