diff --git a/app/views/mailers/notification/bundle_mailer/notification/event/_body.html.erb b/app/views/mailers/notification/bundle_mailer/notification/event/_body.html.erb
index 4ad6f204a..89273ef0d 100644
--- a/app/views/mailers/notification/bundle_mailer/notification/event/_body.html.erb
+++ b/app/views/mailers/notification/bundle_mailer/notification/event/_body.html.erb
@@ -1,7 +1,7 @@
 <% event = notification.source %>
 
 <h3 class="event__title">
-  <%= link_to event_notification_title(event), collection_card_url(notification.card.collection, notification.card) %>
+  <%= link_to event_notification_title(event), notification.source %>
 </h3>
 
 <p class="event__details">
diff --git a/app/views/mailers/notification/bundle_mailer/notification/mention/_body.html.erb b/app/views/mailers/notification/bundle_mailer/notification/mention/_body.html.erb
index a53a996bf..93ad1989b 100644
--- a/app/views/mailers/notification/bundle_mailer/notification/mention/_body.html.erb
+++ b/app/views/mailers/notification/bundle_mailer/notification/mention/_body.html.erb
@@ -1,7 +1,7 @@
 <% mention = notification.source %>
 
 <h3 class="event__title">
-  <%= link_to "#{mention.mentioner.first_name} mentioned you", collection_card_url(notification.card.collection, notification.card) %>
+  <%= link_to "#{mention.mentioner.first_name} mentioned you", event.source %>
 </h3>
 
 <p class="event__details">
diff --git a/config/routes.rb b/config/routes.rb
index 6d55b04e5..769cd0ccb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -173,7 +173,7 @@ Rails.application.routes.draw do
   end
 
   resolve "Event" do |event, options|
-    polymorphic_path(event.target, options)
+    polymorphic_path(event.eventable, options)
   end
 
   get "up", to: "rails/health#show", as: :rails_health_check