diff --git a/src/field.cpp b/src/field.cpp
index 2c5199ad..7beef41c 100644
--- a/src/field.cpp
+++ b/src/field.cpp
@@ -549,6 +549,10 @@ Option<bool> field::flatten_doc(nlohmann::json& document,
     std::unordered_map<std::string, field> flattened_fields_map;
 
     for(auto& nested_field: nested_fields) {
+        if(!nested_field.index) {
+            continue;
+        }
+
         std::vector<std::string> field_parts;
         StringUtils::split(nested_field.name, field_parts, ".");
 
diff --git a/test/collection_nested_fields_test.cpp b/test/collection_nested_fields_test.cpp
index 98a94f37..88002d4c 100644
--- a/test/collection_nested_fields_test.cpp
+++ b/test/collection_nested_fields_test.cpp
@@ -1487,6 +1487,30 @@ TEST_F(CollectionNestedFieldsTest, ExplicitSchemaForNestedArrayTypeValidation) {
               "Hint: field inside an array of objects must be an array type as well.", add_op.error());
 }
 
+TEST_F(CollectionNestedFieldsTest, UnindexedNestedFieldShouldNotClutterSchema) {
+    nlohmann::json schema = R"({
+        "name": "coll1",
+        "enable_nested_fields": true,
+        "fields": [
+            {"name": "block", "type": "object", "optional": true, "index": false}
+        ]
+    })"_json;
+
+    auto op = collectionManager.create_collection(schema);
+    ASSERT_TRUE(op.ok());
+    Collection* coll1 = op.get();
+
+    auto doc1 = R"({
+        "block": {"text": "Hello world."}
+    })"_json;
+
+    auto add_op = coll1->add(doc1.dump(), CREATE);
+    ASSERT_TRUE(add_op.ok());
+
+    // child fields should not become part of schema
+    ASSERT_EQ(1, coll1->get_fields().size());
+}
+
 TEST_F(CollectionNestedFieldsTest, SortByNestedField) {
     nlohmann::json schema = R"({
         "name": "coll1",