diff --git a/app/controllers/concerns/current_conference_assigning.rb b/app/controllers/concerns/current_conference_assigning.rb
index d8ccda1..d39fbc3 100644
--- a/app/controllers/concerns/current_conference_assigning.rb
+++ b/app/controllers/concerns/current_conference_assigning.rb
@@ -12,7 +12,7 @@ module CurrentConferenceAssigning
 
   def current_conference
     if not @current_conference
-      if @conference
+      if @conference and not @conference.new_record?
         @current_conference = @conference
       elsif params[:conference_id].present?
         @current_conference = Conference.find(params[:conference_id])