diff --git a/app/controllers/guests_controller.rb b/app/controllers/guests_controller.rb
index bc2a451..b47ec8e 100644
--- a/app/controllers/guests_controller.rb
+++ b/app/controllers/guests_controller.rb
@@ -3,7 +3,7 @@ class GuestsController < ApplicationController
 
   # GET /guests or /guests.json
   def index
-    @guests = Guest.all
+    @guests = Guest.all.includes(:affinity_groups)
   end
 
   # GET /guests/1 or /guests/1.json
diff --git a/app/views/guests/index.html.erb b/app/views/guests/index.html.erb
index 690588c..a5f8b60 100644
--- a/app/views/guests/index.html.erb
+++ b/app/views/guests/index.html.erb
@@ -18,7 +18,7 @@
       <td><%= guest.full_name %></td>
       <td><%= guest.email %></td>
       <td><%= guest.phone %></td>
-      <td><%= guest.affinity_group_list %></td>
+      <td><%= guest.affinity_groups.pluck(:name).join(", ") %></td>
       <td><%= link_to "Show", guest %></td>
       <td><%= link_to "Edit", edit_guest_path(guest) %></td>
     </tr>