diff --git a/app/models/conference.rb b/app/models/conference.rb
index c91939ae..f4b87791 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -51,7 +51,7 @@ class Conference < ApplicationRecord
   has_many :highlighted_events,
            -> { where(state: :confirmed, is_highlight: true) },
            through: :program,
-           source:  :events
+           source: :events
   has_many :event_types, through: :program
 
   has_many :surveys, as: :surveyable, dependent: :destroy do
diff --git a/app/views/conferences/_highlights.haml b/app/views/conferences/_highlights.haml
index 4b2f601c..31de1088 100644
--- a/app/views/conferences/_highlights.haml
+++ b/app/views/conferences/_highlights.haml
@@ -6,14 +6,14 @@
   .col-md-12
     .row.row-centered.shuffle-deck
       - highlights.each do |event|
-        - speaker = event.speakers_ordered.first
-        .col-md-3.col-sm-3.col-centered.col-top.highlights
-          = link_to(conference_program_proposal_path(conference_id,
-            event),
-            class: 'thumbnail') do
-            = image_tag speaker.profile_picture(size: 300),
-              class: ['img-responsive', 'img-circle'],
-              title: speaker.name
-            .caption
-              %h3.text-center= speaker.name
-              %h4.text-center= event.title
+        - event.speakers_ordered.each do |speaker|
+          .col-md-3.col-sm-3.col-centered.col-top.highlights
+            = link_to(conference_program_proposal_path(conference_id,
+              event),
+              class: 'thumbnail') do
+              = image_tag speaker.profile_picture(size: 300),
+                class: ['img-responsive', 'img-circle'],
+                title: speaker.name
+              .caption
+                %h3.text-center= speaker.name
+                %h4.text-center= event.title