diff --git a/apps/api-documenter/src/documenters/YamlDocumenter.ts b/apps/api-documenter/src/documenters/YamlDocumenter.ts
index 9f04aa959e0..a49d9c9d9a6 100644
--- a/apps/api-documenter/src/documenters/YamlDocumenter.ts
+++ b/apps/api-documenter/src/documenters/YamlDocumenter.ts
@@ -577,11 +577,11 @@ export class YamlDocumenter {
         }
         yamlItem.inheritance = this._renderInheritance(uid, apiItem.extendsTypes);
       }
+    }
 
-      const typeParameters: IYamlParameter[] = this._populateYamlTypeParameters(uid, apiItem);
-      if (typeParameters.length) {
-        yamlItem.syntax = { typeParameters };
-      }
+    const typeParameters: IYamlParameter[] = this._populateYamlTypeParameters(uid, apiItem);
+    if (typeParameters.length) {
+      yamlItem.syntax = { typeParameters };
     }
 
     if (apiItem.tsdocComment) {
diff --git a/common/changes/@microsoft/api-documenter/type-parameters_2022-07-21-12-50.json b/common/changes/@microsoft/api-documenter/type-parameters_2022-07-21-12-50.json
new file mode 100644
index 00000000000..dcf0cee370c
--- /dev/null
+++ b/common/changes/@microsoft/api-documenter/type-parameters_2022-07-21-12-50.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/api-documenter",
+      "comment": "Populate Yaml type parameters for classes",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@microsoft/api-documenter"
+}
\ No newline at end of file