diff --git a/src/components/Editor/Invitees/InviteesList.vue b/src/components/Editor/Invitees/InviteesList.vue
index 03904479d2..03a7730738 100644
--- a/src/components/Editor/Invitees/InviteesList.vue
+++ b/src/components/Editor/Invitees/InviteesList.vue
@@ -29,7 +29,7 @@
 		<OrganizerListItem v-if="hasOrganizer"
 			:is-read-only="isReadOnly"
 			:organizer="calendarObjectInstance.organizer" />
-		<InviteesListItem v-for="invitee in inviteesWithoutOrganizer"
+		<InviteesListItem v-for="invitee in inviteesWithoutOrganizerAndGroupMembership"
 			:key="invitee.email"
 			:attendee="invitee"
 			:is-read-only="isReadOnly"
@@ -120,13 +120,26 @@ export default {
 				return !['RESOURCE', 'ROOM'].includes(attendee.attendeeProperty.userType)
 			})
 		},
-		inviteesWithoutOrganizer() {
+		groups() {
+			return this.calendarObjectInstance.attendees.filter(attendee => {
+				return attendee.attendeeProperty.userType === 'GROUP'
+			})
+		},
+		inviteesWithoutOrganizerAndGroupMembership() {
 			if (!this.calendarObjectInstance.organizer) {
 				return this.invitees
 			}
 
 			return this.invitees
-				.filter(attendee => attendee.uri !== this.calendarObjectInstance.organizer.uri)
+				.filter(attendee => {
+					// Filter attendees which are part of an invited group
+					return !(this.groups.some(function(group) {
+						return group.uri === attendee.member &&
+							attendee.attendeeProperty.userType === 'INDIVIDUAL'
+					}))
+
+					return attendee.uri !== this.calendarObjectInstance.organizer.uri
+				})
 		},
 		hasOrganizer() {
 			return this.calendarObjectInstance.organizer !== null