diff --git a/resources/js/features/meeting/MeetingAttendantsFields.tsx b/resources/js/features/meeting/MeetingAttendantsFields.tsx
index 849b2c246..14611a960 100644
--- a/resources/js/features/meeting/MeetingAttendantsFields.tsx
+++ b/resources/js/features/meeting/MeetingAttendantsFields.tsx
@@ -389,6 +389,11 @@ export const MeetingAttendantsFields: VoidComponent<Props> = (props) => {
                     determineClientsGroupsMode(formData);
                   }
                 } else {
+                  if (prev?.clientsGroupsMode === "none" && !props.viewMode) {
+                    for (let i = 0; i < formData.clients.length; i++) {
+                      setAttendanceGroup(formData, i, groupsByClientId().get(formData.clients[i]!.userId)?.[0] || "");
+                    }
+                  }
                   determineClientsGroupsMode(formData);
                 }
                 setAttendanceGroups(form.data());