diff --git a/source/_partials/talk/events.html.twig b/source/_partials/talk/events.html.twig
index 741b804b..3a1b611a 100644
--- a/source/_partials/talk/events.html.twig
+++ b/source/_partials/talk/events.html.twig
@@ -1,11 +1,21 @@
-{% set talks = getAllTalks([page], site.events) %}
-{% if talks is not empty %}
+{% if page.events %}
-
Events
+
Presented at
- {% include "talks/table" with {
- talks: talks|reverse,
- talk_page: true
- } %}
+
+ {% for event in page.events %}
+ -
+ {% set eventData = site.events[event.event] %}
+ {% if eventData.url %}
+ {{ eventData.name }}
+ {% else %}
+ {{ eventData.name }}
+ {% endif %}
+ {% if eventData.location %}
+ in {{ eventData.location }}
+ {% endif %}
+
+ {% endfor %}
+
{% endif %}