diff --git a/frontend/src/components/assignments/GroupSelector.vue b/frontend/src/components/assignments/GroupSelector.vue
index 3db036c7..00d94187 100644
--- a/frontend/src/components/assignments/GroupSelector.vue
+++ b/frontend/src/components/assignments/GroupSelector.vue
@@ -314,13 +314,16 @@
     function saveDragDrop(): void {
         emit(
             "groupsUpdated",
-            currentGroups.value.map((g) => g.map((s) => s.username)),
+            currentGroups.value
+                .filter((g) => g.length > 0) // Filter out empty groups
+                .map((g) => g.map((s) => s.username)),
         );
         activeDialog.value = null;
         emit("done");
         emit("close");
     }
 
+
     const showGroupsPreview = computed(() => currentGroups.value.length > 0 || unassignedStudents.value.length > 0);
 
     function removeStudent(groupIndex: number, student: StudentItem): void {
@@ -472,7 +475,13 @@
                                 v-if="currentGroups.length === 0"
                                 class="text-center py-4"
                             >
-                                <v-alert type="info">{{ t("no-groups-yet") }}</v-alert>
+                                <div>
+                                    <v-icon
+                                        icon="mdi-information-outline"
+                                        size="small"
+                                    />
+                                    {{ t("currently-no-groups") }}
+                                </div>
                             </div>
 
                             <template v-else>