diff --git a/js/background.js b/js/background.js
index 142492d3d..93cd411ce 100644
--- a/js/background.js
+++ b/js/background.js
@@ -172,8 +172,6 @@
             type           : 'incoming'
         });
 
-        var newUnreadCount = storage.get("unreadCount", 0) + 1;
-        storage.put("unreadCount", newUnreadCount);
         extension.navigator.setBadgeText(newUnreadCount);
 
         return message;
diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 8c4063d04..6633e3689 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -29,11 +29,10 @@
         },
         updateUnreadCount: function(model, count) {
             var prev = model.previous('unreadCount') || 0;
-            if (count < prev) { // decreased
-                var newUnreadCount = storage.get("unreadCount", 0) - (prev - count);
-                setUnreadCount(newUnreadCount);
-                storage.put("unreadCount", newUnreadCount);
-            }
+            var newUnreadCount = storage.get("unreadCount", 0) - (prev - count);
+            setUnreadCount(newUnreadCount);
+            storage.remove("unreadCount");
+            storage.put("unreadCount", newUnreadCount);
         }
     }))();