diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java
index a0897a6a..f3598189 100644
--- a/src/com/android/messaging/datamodel/BugleNotifications.java
+++ b/src/com/android/messaging/datamodel/BugleNotifications.java
@@ -123,14 +123,11 @@ public static void update(final String conversationId, final int coverage) {
     Assert.isNotMainThread();
 
         if (!shouldNotify()) {
+            cancel(PendingIntentConstants.SMS_NOTIFICATION_ID);
             return;
         }
         if ((coverage & UPDATE_MESSAGES) != 0) {
-            if (conversationId == null) {
-                cancel(PendingIntentConstants.SMS_NOTIFICATION_ID);
-            } else {
-                createMessageNotification(conversationId);
-            }
+            createMessageNotification(conversationId);
         }
         if ((coverage & UPDATE_ERRORS) != 0) {
             MessageNotificationState.checkFailedMessages();