diff --git a/KWCore/Sources/Query/CoreDataTasks.swift b/KWCore/Sources/Query/CoreDataTasks.swift
index bc98f0fc..84590988 100644
--- a/KWCore/Sources/Query/CoreDataTasks.swift
+++ b/KWCore/Sources/Query/CoreDataTasks.swift
@@ -246,7 +246,8 @@ public class CoreDataTasks {
     public func complete(_ task: LogTask) -> Void {
         task.completedDate = Date()
         task.lastUpdate = Date()
-        
+        task.hasScheduledNotification = false
+
         do {
             try moc!.save()
 
@@ -278,7 +279,8 @@ public class CoreDataTasks {
     public func cancel(_ task: LogTask) -> Void {
         task.cancelledDate = Date()
         task.lastUpdate = Date()
-        
+        task.hasScheduledNotification = false
+
         do {
             try moc!.save()
 
@@ -299,6 +301,7 @@ public class CoreDataTasks {
     /// - Returns: Void
     public func due(on date: Date, task: LogTask) -> Void {
         task.due = date
+        task.hasScheduledNotification = true
 
         do {
             try moc!.save()