diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b3081f9b..e0b3b85b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -147,7 +147,7 @@ module ApplicationHelper
   end
 
   def speaker_links(event)
-    event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }.join(', ').html_safe
+    safe_join(event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }, ',')
   end
 
   def speaker_selector_input(form)