diff --git a/app/src/main/java/com/todoroo/astrid/data/Task.kt b/app/src/main/java/com/todoroo/astrid/data/Task.kt
index a195984e7..37821ac9b 100644
--- a/app/src/main/java/com/todoroo/astrid/data/Task.kt
+++ b/app/src/main/java/com/todoroo/astrid/data/Task.kt
@@ -138,9 +138,11 @@ data class Task(
 
     val isOverdue: Boolean
         get() {
-            val dueDate = dueDate
+            if (isCompleted || !hasDueDate()) {
+                return false
+            }
             val compareTo = if (hasDueTime()) DateUtilities.now() else DateTimeUtils.newDateTime().startOfDay().millis
-            return dueDate < compareTo && !isCompleted
+            return dueDate < compareTo
         }
 
     fun repeatAfterCompletion(): Boolean = repeatFrom == RepeatFrom.COMPLETION_DATE
diff --git a/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt b/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt
index 88eb853e6..99e7a674d 100644
--- a/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt
+++ b/app/src/test/java/com/todoroo/astrid/data/TaskTest.kt
@@ -1,14 +1,16 @@
 package com.todoroo.astrid.data
 
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.tasks.Freeze
 import org.tasks.Freeze.Companion.freezeAt
 import org.tasks.date.DateTimeUtils
 import org.tasks.time.DateTime
-import java.util.*
+import java.util.TreeSet
 
 class TaskTest {
     @Before
@@ -168,8 +170,8 @@ class TaskTest {
     }
 
     @Test
-    fun testTaskWithNoDueDateIsOverdue() {
-        assertTrue(Task().isOverdue)
+    fun testTaskWithNoDueDateIsNotOverdue() {
+        assertFalse(Task().isOverdue)
     }
 
     @Test