diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
index 35059e3ae7..ef54be3910 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/DefaultMessageNotifier.kt
@@ -187,6 +187,7 @@ class DefaultMessageNotifier(context: Application) : MessageNotifier {
 
     if (state.isEmpty) {
       Log.i(TAG, "State is empty, cancelling all notifications")
+      cancelDelayedNotifications()
       NotificationCancellationHelper.cancelAllMessageNotifications(context, stickyThreads.map { it.value.notificationId }.toSet())
       updateBadge(context, 0)
       clearReminderInternal(context)