diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index d93c415876..fd1fc97540 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -340,7 +340,7 @@ public class MessageNotifier {
 
     if (notificationState.getNotifications().isEmpty()) {
       if (!bundled) cancelActiveNotifications(context);
-      Log.i(TAG, "Empty notification state. Skipping.");
+      Log.i(TAG, "[sendSingleThreadNotification] Empty notification state. Skipping.");
       return;
     }
 
@@ -408,6 +408,11 @@ public class MessageNotifier {
   {
     Log.i(TAG, "sendMultiThreadNotification()  signal: " + signal);
 
+    if (notificationState.getNotifications().isEmpty()) {
+      Log.i(TAG, "[sendMultiThreadNotification] Empty notification state. Skipping.");
+      return;
+    }
+
     MultipleRecipientNotificationBuilder builder       = new MultipleRecipientNotificationBuilder(context, TextSecurePreferences.getNotificationPrivacy(context));
     List<NotificationItem>               notifications = notificationState.getNotifications();