diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
index 028b2c68a..7af63b922 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java
@@ -416,15 +416,17 @@ public class CodeSystemRenderer extends TerminologyRenderer {
       for (PropertyComponent pc : properties) {
         td = tr.td();
         boolean first = true;
-        ConceptPropertyComponent pcv = CodeSystemUtilities.getProperty(c, pc.getCode());
-        if (pcv != null && pcv.hasValue()) {
-          if (first) first = false; else td.addText(", ");
-          if (pcv.hasValueCoding()) { 
-            td.addText(pcv.getValueCoding().getCode());
-          } else if (pcv.hasValueStringType() && Utilities.isAbsoluteUrl(pcv.getValue().primitiveValue())) {
-            td.ah(pcv.getValue().primitiveValue()).tx(pcv.getValue().primitiveValue());
-          } else {
-            td.addText(pcv.getValue().primitiveValue());
+        List<ConceptPropertyComponent> pcvl = CodeSystemUtilities.getPropertyValues(c, pc.getCode());
+        for (ConceptPropertyComponent pcv : pcvl) {
+          if (pcv.hasValue()) {
+            if (first) first = false; else td.addText(", ");
+            if (pcv.hasValueCoding()) { 
+              td.addText(pcv.getValueCoding().getCode());
+            } else if (pcv.hasValueStringType() && Utilities.isAbsoluteUrl(pcv.getValue().primitiveValue())) {
+              td.ah(pcv.getValue().primitiveValue()).tx(pcv.getValue().primitiveValue());
+            } else {
+              td.addText(pcv.getValue().primitiveValue());
+            }
           }
         }
       }