diff --git a/backend/src/interfaces/assignment.ts b/backend/src/interfaces/assignment.ts
index 2dc158d2..32c2f5c8 100644
--- a/backend/src/interfaces/assignment.ts
+++ b/backend/src/interfaces/assignment.ts
@@ -20,7 +20,7 @@ export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO {
         description: assignment.description,
         learningPath: assignment.learningPathHruid,
         language: assignment.learningPathLanguage,
-        deadline: assignment.deadline ?? new Date(),
+        deadline: assignment.deadline ?? null,
         groups: assignment.groups.map((group) => mapToGroupDTO(group, assignment.within)),
     };
 }
diff --git a/frontend/src/components/assignments/GroupSelector.vue b/frontend/src/components/assignments/GroupSelector.vue
index 16dc93e8..3db036c7 100644
--- a/frontend/src/components/assignments/GroupSelector.vue
+++ b/frontend/src/components/assignments/GroupSelector.vue
@@ -562,7 +562,6 @@
                     <v-btn
                         color="primary"
                         @click="saveDragDrop"
-                        :disabled="unassignedStudents.length > 0"
                     >
                         {{ t("save") }}
                     </v-btn>