diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 6aa9c2218..a3219eb12 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -360,7 +360,12 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
             date = dateTime.withMillisOfDay(0).getMillis();
             if (Task.hasDueTime(dateTime.getMillis())) {
                 setTime(dateTime.getMillisOfDay());
+            } else {
+                time = -1;
             }
+        } else {
+            date = 0;
+            time = -1;
         }
         refreshDisplayView();
     }