diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 552f7200ef..936548ecc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -284,8 +284,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
         sendMultipleThreadNotification(context, notificationState, signal);
       } else if (notificationState.getMessageCount() > 0){
         sendSingleThreadNotification(context, notificationState, signal, false);
+      } else {
+        cancelActiveNotifications(context);
       }
-
       cancelOrphanedNotifications(context, notificationState);
       updateBadge(context, notificationState.getMessageCount());