diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
index 79888d9a9718..61f71e2ee253 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/fleet_agent_generator.ts
@@ -82,6 +82,10 @@ export class FleetAgentGenerator extends BaseDataGenerator<Agent> {
           action_seq_no: -1,
           active: true,
           enrolled_at: now,
+          agent: {
+            id: this.randomUUID(),
+            version: this.randomVersion(),
+          },
           local_metadata: {
             elastic: {
               agent: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
index 52998b090e3b..901af259a5d2 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_fleet_agent.ts
@@ -48,6 +48,10 @@ export const indexFleetAgentForHost = async (
 ): Promise<IndexedFleetAgentResponse> => {
   const agentDoc = fleetAgentGenerator.generateEsHit({
     _source: {
+      agent: {
+        id: endpointHost.agent.id,
+        version: endpointHost.agent.version,
+      },
       local_metadata: {
         elastic: {
           agent: {