diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/get_cluster_info.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/get_cluster_info.ts
index a11365feef73..3d1f6e539936 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/get_cluster_info.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/get_cluster_info.ts
@@ -15,7 +15,7 @@ export interface ClusterInfo {
   cluster_name: string;
   cluster_uuid: string;
   cluster_version: string;
-  cluster_build_flavor: string;
+  cluster_build_flavor?: string;
 }
 
 /**
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/register_analytics_context_provider.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/register_analytics_context_provider.ts
index be909f5ba21e..35845519d1e1 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/register_analytics_context_provider.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/register_analytics_context_provider.ts
@@ -27,7 +27,10 @@ export function registerAnalyticsContextProvider(
       cluster_name: { type: 'keyword', _meta: { description: 'The Cluster Name' } },
       cluster_uuid: { type: 'keyword', _meta: { description: 'The Cluster UUID' } },
       cluster_version: { type: 'keyword', _meta: { description: 'The Cluster version' } },
-      cluster_build_flavor: { type: 'keyword', _meta: { description: 'The Cluster build flavor' } },
+      cluster_build_flavor: {
+        type: 'keyword',
+        _meta: { description: 'The Cluster build flavor', optional: true },
+      },
     },
   });
 }