diff --git a/x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts b/x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
index 69da4c5d8287d..a99b9be261911 100644
--- a/x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
+++ b/x-pack/plugins/streams/server/lib/streams/component_templates/generate_layer.ts
@@ -36,7 +36,7 @@ export function generateLayer(
     template: {
       settings: isRoot(definition.id) ? logsSettings : {},
       mappings: {
-        subobjects: true, // TODO set to false once this works on Elasticsearch side - right now fields are not properly indexed.
+        subobjects: false,
         dynamic: false,
         properties,
       },