diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
index f41439c0e..ee751b69b 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
@@ -87,8 +87,8 @@ class TaskDao @Inject constructor(
             val deletionDateModified = task.deletionDate != original?.deletionDate ?: 0
             val justCompleted = completionDateModified && task.isCompleted
             val justDeleted = deletionDateModified && task.isDeleted
-            if (justCompleted) {
-                workManager.afterComplete(task, original)
+            if (justCompleted && (task.isRecurring || !task.calendarURI.isNullOrBlank())) {
+                workManager.afterComplete(task)
             }
 
             if (justCompleted || justDeleted) {