diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 9dcbc6065..ceca1ba3f 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -1078,9 +1078,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         if (activity == null)
             return;
         // show item as completed if it was recently checked
-        if(completedItems.get(task.getUuid()) != null || completedItems.get(task.getId()) != null) {
+        Boolean value = completedItems.get(task.getUuid());
+        if (value == null)
+            value = completedItems.get(task.getId());
+        if(value != null) {
             task.setValue(Task.COMPLETION_DATE,
-                    completedItems.get(task.getId()) ? DateUtilities.now() : 0);
+                    value ? DateUtilities.now() : 0);
         }
         boolean state = task.isCompleted();