diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Schema.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Schema.cs
index ff0f7869d54..5be4e5a7141 100644
--- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Schema.cs
+++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Schema.cs
@@ -37,9 +37,9 @@ public class Schema : Items, ITokenSerializable
             tableItems = this.TokenSerializePropertyIntoTableItems(context, this.tableItems);
             var tableRet = new List<CodeFileToken>();
             var tableRows = new List<CodeFileToken>();
-            if (tableItems.Count > 0)
+            foreach (var tableItem in this.tableItems)
             {
-                tableRows.AddRange(tableItems[0].TokenSerialize(context)); // Serialize only first row to avoid flattened properties
+                tableRows.AddRange(tableItem.TokenSerialize(context));
             }
             if (tableRows.Count > 0)
             {