diff --git a/source/_includes/session-speakers.html.twig b/source/_includes/session-speakers.html.twig
index 67143bb3c..76cc23f32 100644
--- a/source/_includes/session-speakers.html.twig
+++ b/source/_includes/session-speakers.html.twig
@@ -1,7 +1,7 @@
 <h2>Speakers</h2>
 
 <ul>
-  {% for speaker in speakers if speaker.name in session.speakers %}
+  {% for speaker in speakers %}
     <li>
       <a href="{{ speaker.url }}">
         {{ speaker.name }}
diff --git a/source/_layouts/session.html.twig b/source/_layouts/session.html.twig
index c512ea9d4..bf7fd2705 100644
--- a/source/_layouts/session.html.twig
+++ b/source/_layouts/session.html.twig
@@ -1,8 +1,7 @@
 {% extends 'page' %}
 
 {% block content_bottom %}
-  {% include 'session-speakers' with {
-    session: page,
-    speakers: data.speakers,
-  } %}
+    {% include 'session-speakers' with {
+        speakers: sessionSpeakers(page, data.speakers),
+    } %}
 {% endblock %}