diff --git a/app/services/user_event_creator.rb b/app/services/user_event_creator.rb index 830fb4fe78d..c976f6ba8fa 100644 --- a/app/services/user_event_creator.rb +++ b/app/services/user_event_creator.rb @@ -11,7 +11,10 @@ def initialize(current_user:, request: nil) # @return [Array(Event, String)] an (event, disavowal_token) tuple def create_user_event(event_type, user = current_user, disavowal_token = nil) return unless user&.id - existing_device = Device.find_by(user_id: user.id, cookie_uuid: cookies[:device]) + existing_device = cookies[:device] && Device.find_by( + user_id: user.id, + cookie_uuid: cookies[:device], + ) if existing_device.present? create_event_for_existing_device( event_type: event_type, user: user, device: existing_device,