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 597452d89..f702cedc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -271,6 +271,10 @@ public class DefaultMessageNotifier implements MessageNotifier {
                                  int      reminderCount,
                                  @NonNull BubbleUtil.BubbleState defaultBubbleState)
   {
+    if (!TextSecurePreferences.isNotificationsEnabled(context)) {
+      return;
+    }
+
     boolean isReminder  = reminderCount > 0;
     Cursor  telcoCursor = null;
     Cursor  pushCursor  = null;