diff --git a/source/_patterns/03-layouts/ofis/ofis.twig b/source/_patterns/03-layouts/ofis/ofis.twig
index eb29708e15084a4232ce6a7b76f9f1703640454a..70870e76605c49ea05a2bdfd984f8265876d18b4 100644
--- a/source/_patterns/03-layouts/ofis/ofis.twig
+++ b/source/_patterns/03-layouts/ofis/ofis.twig
@@ -43,8 +43,20 @@
   <h2>Education</h2>
   <ul>
     {% for degree in ofis_data.education %}
-      <li>{{ degree.degree_yr }}, {{ degree.degree_name }}, {{ degree.name_of_discipline }}
-        , {{ degree.institution }}</li>
+      <li>
+        {% if degree.degree_yr %}
+          {{ degree.degree_yr }},
+        {% endif %}
+        {% if degree.degree_name %}
+          {{ degree.degree_name }},
+        {% endif %}
+        {% if degree.name_of_discipline %}
+          {{ degree.name_of_discipline }},
+        {% endif %}
+        {% if degree.institution %}
+          {{ degree.institution }}
+        {% endif %}
+      </li>
     {% endfor %}
   </ul>
 {% endif %}