diff --git a/lib/models/task.dart b/lib/models/task.dart
index 4724146..9bdfda8 100644
--- a/lib/models/task.dart
+++ b/lib/models/task.dart
@@ -138,8 +138,11 @@ class Task {
     DateTime? created,
     DateTime? updated,
     DateTime? dueDate,
+    bool? clearDueDate,
     DateTime? startDate,
+    bool? clearStartDate,
     DateTime? endDate,
+    bool? clearEndDate,
     List<DateTime>? reminderDates,
     String? title,
     String? description,
@@ -150,6 +153,7 @@ class Task {
     double? kanbanPosition,
     User? createdBy,
     Duration? repeatAfter,
+    bool? clearRepeatAfter,
     List<Task>? subtasks,
     List<Label>? labels,
     List<TaskAttachment>? attachments,
@@ -162,9 +166,9 @@ class Task {
       bucketId: bucketId ?? this.bucketId,
       created: created ?? this.created,
       updated: updated ?? this.updated,
-      dueDate: dueDate ?? this.dueDate,
-      startDate: startDate ?? this.startDate,
-      endDate: endDate ?? this.endDate,
+      dueDate: (clearDueDate ?? false) ? null : (dueDate ?? this.dueDate),
+      startDate: (clearStartDate ?? false) ? null : (startDate ?? this.startDate),
+      endDate: (clearEndDate ?? false) ? null : (endDate ?? this.endDate),
       reminderDates: reminderDates ?? this.reminderDates,
       title: title ?? this.title,
       description: description ?? this.description,
@@ -173,7 +177,7 @@ class Task {
       color: (resetColor ?? false) ? null : (color ?? this.color),
       kanbanPosition: kanbanPosition ?? this.kanbanPosition,
       createdBy: createdBy ?? this.createdBy,
-      repeatAfter: repeatAfter ?? this.repeatAfter,
+      repeatAfter: (clearRepeatAfter ?? false) ? null : (repeatAfter ?? this.repeatAfter),
       subtasks: subtasks ?? this.subtasks,
       labels: labels ?? this.labels,
       attachments: attachments ?? this.attachments,
diff --git a/lib/pages/list/task_edit.dart b/lib/pages/list/task_edit.dart
index 9a58525..7ecf0fd 100644
--- a/lib/pages/list/task_edit.dart
+++ b/lib/pages/list/task_edit.dart
@@ -370,8 +370,11 @@ class _TaskEditPageState extends State<TaskEditPage> {
       description: _description,
       reminderDates: _reminderDates,
       dueDate: _dueDate,
+      clearDueDate: _dueDate == null,
       startDate: _startDate,
+      clearStartDate: _startDate == null,
       endDate: _endDate,
+      clearEndDate: _endDate == null,
       priority: _priority,
       repeatAfter: _repeatAfter,
       labels: _labels,
diff --git a/lib/utils/repeat_after_parse.dart b/lib/utils/repeat_after_parse.dart
index a6bc042..b2a5d8d 100644
--- a/lib/utils/repeat_after_parse.dart
+++ b/lib/utils/repeat_after_parse.dart
@@ -1,4 +1,4 @@
-getRepeatAfterTypeFromDuration(Duration? repeatAfter) {
+String? getRepeatAfterTypeFromDuration(Duration? repeatAfter) {
   if (repeatAfter == null || repeatAfter.inSeconds == 0) {
     return null;
   }
@@ -18,7 +18,7 @@ getRepeatAfterTypeFromDuration(Duration? repeatAfter) {
   return 'Hours';
 }
 
-getRepeatAfterValueFromDuration(Duration? repeatAfter) {
+int? getRepeatAfterValueFromDuration(Duration? repeatAfter) {
   if (repeatAfter == null || repeatAfter.inSeconds == 0) {
     return null;
   }
@@ -43,13 +43,16 @@ getRepeatAfterValueFromDuration(Duration? repeatAfter) {
   return repeatAfter.inHours;
 }
 
-getDurationFromType(String? value, String? type) {
+Duration? getDurationFromType(String? value, String? type) {
   // Return an empty duration if either of the values is not set
   if (value == null || value == '' || type == null || type == '') {
     return Duration();
   }
 
-  int val = int.parse(value);
+  int? val = int.tryParse(value);
+  if (val == null) {
+    return null;
+  }
 
   switch (type) {
     case 'Hours':
@@ -63,4 +66,6 @@ getDurationFromType(String? value, String? type) {
     case 'Years':
       return Duration(days: val * 365);
   }
+  
+  return null;
 }
diff --git a/test/parse_repeat_after_test.dart b/test/parse_repeat_after_test.dart
index 7564c75..3af91fe 100644
--- a/test/parse_repeat_after_test.dart
+++ b/test/parse_repeat_after_test.dart
@@ -45,32 +45,32 @@ void main() {
   });
 
   test('Hours to duration', () {
-    Duration parsedDuration = getDurationFromType('6', 'Hours');
+    Duration? parsedDuration = getDurationFromType('6', 'Hours');
     expect(parsedDuration, Duration(hours: 6));
   });
 
   test('Days to duration', () {
-    Duration parsedDuration = getDurationFromType('6', 'Days');
+    Duration? parsedDuration = getDurationFromType('6', 'Days');
     expect(parsedDuration, Duration(days: 6));
   });
 
   test('Weeks to duration', () {
-    Duration parsedDuration = getDurationFromType('6', 'Weeks');
+    Duration? parsedDuration = getDurationFromType('6', 'Weeks');
     expect(parsedDuration, Duration(days: 6 * 7));
   });
 
   test('Months to duration', () {
-    Duration parsedDuration = getDurationFromType('6', 'Months');
+    Duration? parsedDuration = getDurationFromType('6', 'Months');
     expect(parsedDuration, Duration(days: 6 * 30));
   });
 
   test('Years to duration', () {
-    Duration parsedDuration = getDurationFromType('6', 'Years');
+    Duration? parsedDuration = getDurationFromType('6', 'Years');
     expect(parsedDuration, Duration(days: 6 * 365));
   });
 
   test('null to duration', () {
-    Duration parsedDuration = getDurationFromType(null, null);
+    Duration? parsedDuration = getDurationFromType(null, null);
     expect(parsedDuration, Duration());
   });
 }