diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index aab7df95986582fdb40d220cdcf24ce0c998f225..9ffc221555b986c1b75e9e9a24e8dabf3af08b1b 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -170,7 +170,7 @@ class Attendee(models.Model):
         invitation_template = self.env.ref(template_xmlid)
 
         # get ics file for all meetings
-        ics_files = self.mapped('event_id').get_ics_file()
+        ics_files = self.mapped('event_id')._get_ics_file()
 
         # prepare rendering context for mail template
         colors = {
@@ -946,7 +946,7 @@ class Meeting(models.Model):
     ####################################################
 
     @api.multi
-    def get_ics_file(self):
+    def _get_ics_file(self):
         """ Returns iCalendar file for the event invitation.
             :returns a dict of .ics file content for each meeting
         """
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index d6e03931722bc7bcd85d09388b3caeec8ffa3016..a06d9500233053ed449e36db2c604bede5c6b3d9 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -10,7 +10,7 @@ from dateutil.relativedelta import relativedelta
 
 from odoo import fields, http, _
 from odoo.addons.http_routing.models.ir_http import slug
-from odoo.http import request
+from odoo.http import content_disposition, request
 
 
 class WebsiteEventController(http.Controller):
@@ -270,15 +270,14 @@ class WebsiteEventController(http.Controller):
             'iCal_url': urls.get('iCal_url')
         })
 
-    @http.route(['/event/<model("event.event"):event>/ics/<string:name>.ics'], type='http', auth="public", website=True)
+    @http.route(['/event/<model("event.event"):event>/ics'], type='http', auth="public", website=True)
     def make_event_ics_file(self, event, **kwargs):
         if not event or not event.registration_ids:
             return request.not_found()
-        attendee_ids = list(json.loads(kwargs.get('attendees', '{}').replace("'", '"')).values())
-        files = event.get_ics_file(attendee_ids)
+        files = event._get_ics_file()
         content = files[event.id]
         return request.make_response(content, [
             ('Content-Type', 'application/octet-stream'),
             ('Content-Length', len(content)),
-            ('Content-Disposition', 'attachment; filename=' + event.name + '.ics')
+            ('Content-Disposition', content_disposition('%s.ics' % event.name))
         ])
diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py
index 573f8b34fbacba865526393671a3b20ebcdeca86..b9ddc4fbeda3a424c46310aeab31850d1be86355 100644
--- a/addons/website_event/models/event.py
+++ b/addons/website_event/models/event.py
@@ -136,7 +136,7 @@ class Event(models.Model):
         }
 
     @api.multi
-    def get_ics_file(self, attendee_ids):
+    def _get_ics_file(self):
         """ Returns iCalendar file for the event invitation.
             :returns a dict of .ics file content for each event
         """
@@ -157,10 +157,6 @@ class Event(models.Model):
             if event.address_id:
                 cal_event.add('location').value = event.sudo().address_id.contact_address
 
-            attendees = self.env['event.registration'].browse(attendee_ids)
-            for attendee in attendees:
-                attendee_add = cal_event.add('attendee')
-                attendee_add.value = u'MAILTO:' + (attendee.email or u'')
             result[event.id] = cal.serialize().encode('utf-8')
         return result
 
@@ -175,8 +171,5 @@ class Event(models.Model):
             'details': self.name,
         })
         google_url = GOOGLE_CALENDAR_URL + params
-        params = werkzeug.url_encode({
-            'attendees': dict(('attendee_%s' % attendee, attendee) for attendee in attendees)
-        })
-        iCal_url = '/event/%s/ics/%s.ics?' % (slug(self), self.name) + params
+        iCal_url = '/event/%s/ics?%s' % (slug(self), params)
         return {'google_url': google_url, 'iCal_url': iCal_url}