diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
index 21d5714de2..52f5de8505 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_list.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load icon %}
 {% load eventurl %}
+{% load date_fast %}
 
 <div class="event-list full-width-list alternating-rows">
 {% for subev in subevent_list.subevent_list %}
@@ -17,12 +18,12 @@
                 <span data-time="{{ subev.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                     {% icon "clock-o" %}
                     <span class="sr-only">{% trans "Time of day" %}</span>
-                    <time datetime="{{ subev.date_from.isoformat }}">{{ subev.date_from|date:"TIME_FORMAT" }}</time>
+                    <time datetime="{{ subev.date_from|date_fast:"H:i" }}">{{ subev.date_from|date_fast:"TIME_FORMAT" }}</time>
                 </span>
-                {% if subev.event.settings.show_date_to and subev.date_to %}
+                {% if subev.event.settings.show_date_to and subev.date_to and subev.date_to.date == subev.date_from.date %}
                     <span data-time="{{ subev.date_to.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                         <span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span>
-                        <time datetime="{{ subev.date_to.time.isoformat }}">{{ subev.date_to|date:"TIME_FORMAT" }}</time>
+                        <time datetime="{{ subev.date_to|date_fast:"H:i" }}">{{ subev.date_to|date_fast:"TIME_FORMAT" }}</time>
                     </span>
                 {% endif %}
             {% endif %}