diff --git a/csdl-to-json-convertor/csdl-to-json.py b/csdl-to-json-convertor/csdl-to-json.py
index f9d33a27..ba079cb6 100644
--- a/csdl-to-json-convertor/csdl-to-json.py
+++ b/csdl-to-json-convertor/csdl-to-json.py
@@ -347,6 +347,9 @@ def process_excerpts( self ):
                 # Strip out properties that do not apply
                 remove_list = []
                 for prop_name, prop in excerpt_def["properties"].items():
+                    if prop_name == "Oem":
+                        # Oem is not tagged since it's a common property we don't want to annotate, but it's assumed to be allowed in excerpts
+                        continue
                     if "excerpt" in prop:
                         if ( excerpt not in prop["excerpt"].split( "," ) ) and ( prop["excerpt"] != base_name ):
                             remove_list.append( prop_name )
diff --git a/doc-generator/doc_formatter/doc_formatter.py b/doc-generator/doc_formatter/doc_formatter.py
index cf76ffe3..47583a50 100644
--- a/doc-generator/doc_formatter/doc_formatter.py
+++ b/doc-generator/doc_formatter/doc_formatter.py
@@ -2087,6 +2087,10 @@ def format_object_descr(self, schema_ref, prop_info, prop_path=[], is_action=Fal
                     filtered_properties[k] = properties[k]
                 prop_info['properties'] = properties = filtered_properties
 
+            # Filter out "Oem" property for excerpts
+            if (prop_info.get('_is_excerpt') or prop_info.get('_excerpt_link_text') or prop_info.get('excerptCopy')) and 'Oem' in prop_names:
+                prop_names.remove('Oem')
+
 
             if is_action:
                 prop_names = [x for x in prop_names if x.startswith('#')]