diff --git a/app/models/trip_part.rb b/app/models/trip_part.rb
index 8f69327c..799a06cf 100644
--- a/app/models/trip_part.rb
+++ b/app/models/trip_part.rb
@@ -497,7 +497,7 @@ def create_rideshare_itineraries
         Rails.logger.info "SKIP_DYNAMIC_RIDESHARE_DURATION is set, skipping it"
       end
       i = Itinerary.new(itinerary)
-      service_window = itinerary.service.service_window if itinerary && itinerary.service
+      service_window = i.service.service_window if i && i.service
       i.estimate_duration(base_duration, Oneclick::Application.config.minimum_rideshare_duration, Oneclick::Application.config.rideshare_duration_factor, service_window, trip_time, is_depart)
       itins << i
     else