diff --git a/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts b/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
index fe426aab29b8e..9d506c2ea6409 100644
--- a/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
+++ b/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
@@ -89,8 +89,7 @@ export const updateUnderlyingMapping = async ({ logger, esClient, index }: Updat
 
   try {
     await retryTransientEsErrors(
-      // @ts-expect-error elasticsearch@9.0.0 https://github.com/elastic/elasticsearch-js/issues/2584
-      () => esClient.indices.putMapping({ index, body: simulatedMapping }),
+      () => esClient.indices.putMapping({ index, ...simulatedMapping }),
       { logger }
     );
     logger.info(`Update mappings for ${index}`);
diff --git a/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_or_update_index.ts b/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_or_update_index.ts
index 1d8cdbc5cc0ef..8305a4531b823 100644
--- a/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_or_update_index.ts
+++ b/x-pack/solutions/security/plugins/security_solution/server/lib/entity_analytics/utils/create_or_update_index.ts
@@ -40,8 +40,7 @@ export const createOrUpdateIndex = async ({
           indices.map(async (index) => {
             try {
               await retryTransientEsErrors(
-                // @ts-expect-error elasticsearch@9.0.0 https://github.com/elastic/elasticsearch-js/issues/2584
-                () => esClient.indices.putMapping({ index, body: options.mappings }),
+                () => esClient.indices.putMapping({ index, ...options.mappings }),
                 { logger }
               );
               logger.info(`Update mappings for ${index}`);