diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
index 5239ed44b..b2f085d34 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
@@ -122,6 +122,7 @@ class NotificationTray @Inject constructor(
                         habit.id
                     )
                 )
+                active.remove(habit)
                 return
             }
             if (!habit.hasReminder()) {
@@ -132,6 +133,7 @@ class NotificationTray @Inject constructor(
                         habit.id
                     )
                 )
+                active.remove(habit)
                 return
             }
             if (habit.isArchived) {
@@ -142,6 +144,7 @@ class NotificationTray @Inject constructor(
                         habit.id
                     )
                 )
+                active.remove(habit)
                 return
             }
             if (!shouldShowReminderToday()) {
@@ -152,6 +155,7 @@ class NotificationTray @Inject constructor(
                         habit.id
                     )
                 )
+                active.remove(habit)
                 return
             }
             systemTray.showNotification(