diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
index 6f1560541..542b2136d 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
@@ -177,9 +177,9 @@ class RepeatControlSet : TaskEditControlFragment() {
     override fun controlId() = TAG
 
     override fun hasChanges(original: Task): Boolean {
-        return (recurrenceValue != original.recurrence
-                || original.repeatUntil
-                != if (rrule == null) 0 else DateTime.from(rrule!!.until).millis)
+        val repeatUntil = rrule?.let { DateTime.from(it.until).millis } ?: 0
+        return recurrenceValue != original.recurrence.orEmpty()
+                || original.repeatUntil != repeatUntil
     }
 
     override fun apply(task: Task) {