diff --git a/xml_converter/generators/main.py b/xml_converter/generators/main.py
index 7e7f99e7..187b2440 100644
--- a/xml_converter/generators/main.py
+++ b/xml_converter/generators/main.py
@@ -261,7 +261,8 @@ def generate_auto_docs(self, metadata: Dict[str, MetadataType], content: Dict[st
                 description=content[fieldkey]  # todo:
             ))
 
-            if fieldval.variable_type == "CompoundValue":
+            # Include the "component" fields of any compound fields
+            if fieldval.variable_type == "CompoundValue" or fieldval.variable_type == "CompoundCustomClass":
                 for component_field in fieldval.components:
 
                     binary_field_name = fieldval.protobuf_field + "." + component_field.protobuf_field