diff --git a/addons/google_calendar/models/calendar.py b/addons/google_calendar/models/calendar.py
index b2aeae22984..61df4646718 100644
--- a/addons/google_calendar/models/calendar.py
+++ b/addons/google_calendar/models/calendar.py
@@ -94,6 +94,12 @@ class Meeting(models.Model):
         attendee_commands = []
         partner_commands = []
         google_attendees = google_event.attendees or []
+        if google_event.organizer and google_event.organizer.get('self', False):
+            user = google_event.owner(self.env)
+            google_attendees += [{
+                'email': user.partner_id.email,
+                'status': {'response': 'accepted'},
+            }]
         emails = [a.get('email') for a in google_attendees]
         existing_attendees = self.env['calendar.attendee']
         if google_event.exists(self.env):
@@ -173,6 +179,7 @@ class Meeting(models.Model):
             'method': "email" if alarm.alarm_type == "email" else "popup",
             'minutes': alarm.duration_minutes
         } for alarm in self.alarm_ids]
+        attendee_ids = self.attendee_ids.filtered(lambda a: a.partner_id not in self.user_id.partner_id)
         values = {
             'id': self.google_id,
             'start': start,
diff --git a/addons/google_calendar/tests/test_sync_google2odoo.py b/addons/google_calendar/tests/test_sync_google2odoo.py
index 0c0cd8352b6..4e2d1a7d809 100644
--- a/addons/google_calendar/tests/test_sync_google2odoo.py
+++ b/addons/google_calendar/tests/test_sync_google2odoo.py
@@ -48,10 +48,11 @@ class TestSyncGoogle2Odoo(TransactionCase):
         self.assertEqual(event.description, values.get('description'))
         self.assertEqual(event.start, datetime(2020, 1, 13, 15, 55))
         self.assertEqual(event.stop, datetime(2020, 1, 13, 18, 55))
-        self.assertEqual('admin@yourcompany.example.com', event.attendee_ids.email)
-        self.assertEqual('Mitchell Admin', event.attendee_ids.partner_id.name)
+        admin_attendee = event.attendee_ids.filtered(lambda e: e.email == 'admin@yourcompany.example.com')
+        self.assertEqual('admin@yourcompany.example.com', admin_attendee.email)
+        self.assertEqual('Mitchell Admin', admin_attendee.partner_id.name)
         self.assertEqual(event.partner_ids, event.attendee_ids.partner_id)
-        self.assertEqual('needsAction', event.attendee_ids.state)
+        self.assertEqual('needsAction', admin_attendee.state)
 
     def test_cancelled(self):
         google_id = 'oj44nep1ldf8a3ll02uip0c9aa'
@@ -122,8 +123,9 @@ class TestSyncGoogle2Odoo(TransactionCase):
         self.assertEqual(event.partner_ids, user.partner_id)
         self.assertEqual(event.attendee_ids.partner_id, user.partner_id)
         self.sync(gevent)
-        self.assertFalse(event.attendee_ids, "The attendee should have been removed")
-        self.assertFalse(event.partner_ids, "The partner should have been removed")
+        # User attendee removed but gevent owner might be added after synch.
+        self.assertNotEqual(event.attendee_ids.partner_id, user.partner_id)
+        self.assertNotEqual(event.partner_ids, user.partner_id)
 
     def test_recurrence(self):
         recurrence_id = 'oj44nep1ldf8a3ll02uip0c9aa'