diff --git a/source/_partials/availability.html.twig b/source/_partials/availability.html.twig
index 946a60cb..39d16889 100644
--- a/source/_partials/availability.html.twig
+++ b/source/_partials/availability.html.twig
@@ -27,13 +27,15 @@
             {% if start %}
                 {% if start|date('U') > now %}
                     {% set text = text ~ ' starting ' ~ start|date('F Y') %}
-                {% endif %}
 
-                {% if end %}
-                    {% set text = text ~ ', until ' ~ end|date('F Y') %}
+                    {% if end %}
+                        {% set text = text ~ ',' %}
+                    {% endif %}
                 {% endif %}
-            {% elseif end %}
-                {% set text = text ~ ', until ' ~ end|date('F Y') %}
+            {% endif %}
+
+            {% if end %}
+                {% set text = text ~ ' until ' ~ end|date('F Y') %}
             {% endif %}
 
             <p>{{ text }}.</p>