diff --git a/app/views/rsvps/_form.html.erb b/app/views/rsvps/_form.html.erb
index 7b969ba0a..e8fcc4a62 100644
--- a/app/views/rsvps/_form.html.erb
+++ b/app/views/rsvps/_form.html.erb
@@ -34,7 +34,7 @@
   <strong>Sessions you're attending</strong>
   <% @rsvp.event.event_sessions.order('starts_at ASC').each do |session| %>
     <%= label_tag do %>
-      <%= check_box_tag 'rsvp_sessions[]', session.id, @rsvp.rsvp_sessions.where(event_session_id: session.id).any? %>
+      <%= check_box_tag 'rsvp_sessions[]', session.id, @rsvp.new_record? ? true : @rsvp.rsvp_sessions.where(event_session_id: session.id).any? %>
       <%= session.name  %>: <%= formatted_session_date(session) %> <%= formatted_session_timerange(session) %>
     <% end %>
   <% end %>
diff --git a/spec/requests/event_listing_request_spec.rb b/spec/requests/event_listing_request_spec.rb
index 5177c3dcf..04b2c054a 100644
--- a/spec/requests/event_listing_request_spec.rb
+++ b/spec/requests/event_listing_request_spec.rb
@@ -92,7 +92,9 @@
         fill_in "rsvp_teaching_experience", :with => "I have taught all kinds of things."
         check 'Teaching'
 
-        check "Installfest"
+        page.find("input[type='checkbox'][value='#{@session1.id}']").should be_checked
+        page.find("input[type='checkbox'][value='#{@session2.id}']").should be_checked
+
         uncheck "Curriculum"
 
         click_button "Submit"