diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 5d92c5312..f32d12ff4 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -149,7 +149,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
 
-        versionCode 2194
+        versionCode 2198
         versionName "2.1"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
index 65d163cf7..38c4ea077 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
@@ -49,6 +49,9 @@ class TaskSchedulingControls @JvmOverloads constructor(
     set(value) {
         field = value
         configureViewsForType()
+        if (value == Task.TYPE_TODO) {
+            dueDate = null
+        }
     }
     var startDate = Date()
     set(value) {
@@ -61,7 +64,11 @@ class TaskSchedulingControls @JvmOverloads constructor(
     var dueDate: Date? = null
     set(value) {
         field = value
-        value?.let { startDateTextView.text = dateFormatter.format(it) }
+        if (value != null) {
+            startDateTextView.text = dateFormatter.format(value)
+        } else {
+            startDateTextView.text = null
+        }
     }
     var frequency = Task.FREQUENCY_DAILY
     set(value) {