diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb
index 2175eb0f..7dfe8f36 100644
--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@@ -8,12 +8,12 @@ class EmailSettings < ActiveRecord::Base
         "email" => person.email,
         "name" => person.public_name,
         "conference" => conference.title,
-        "proposalslink" => Rails.application.routes.url_helpers.conference_proposal_url(conference.short_title, event, :host => OSEM_CONFIG["url_for_emails"]),
         "registrationlink" => Rails.application.routes.url_helpers.register_conference_url(conference.short_title, :host => OSEM_CONFIG["url_for_emails"])
     }
 
     if !event.nil?
       h["eventtitle"] = event.title
+      h["proposalslink"] = Rails.application.routes.url_helpers.conference_proposal_url(conference.short_title, event, :host => OSEM_CONFIG["url_for_emails"])
     end
     h
   end