diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index fe2197fe6d8c8cfb63d5475b0aa4c32e27ad90df..f4a6ef492fcd0b2d03cc820375f90a081b0c3f5b 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -70,8 +70,8 @@ class AssignmentsController < ApplicationController
           other_users = other_users - [ @user.name ]
 
           event = Icalendar::Event.new
-          event.dtstart = Icalendar::Values::DateTime.new(session.starts_at, tzid: session.starts_at.zone)
-          event.dtend = Icalendar::Values::DateTime.new(session.ends_at, tzid: session.ends_at.zone)
+          event.dtstart = Icalendar::Values::DateTime.new(session.starts_at, tzid: session.starts_at.time_zone.tzinfo.name)
+          event.dtend = Icalendar::Values::DateTime.new(session.ends_at, tzid: session.ends_at.time_zone.tzinfo.name)
           event.summary = [session.title, session.stage.name].join(' @ ')
           event.description = other_users.join(', ') + "\n\n" + helpers.strip_tags(session.description)
           event.location = [session.stage.name, session.conference.name].join(' @ ')