diff --git a/js/inbox_controller.js b/js/inbox_controller.js
index 83a3e91aa..a720cd5d1 100644
--- a/js/inbox_controller.js
+++ b/js/inbox_controller.js
@@ -31,9 +31,9 @@
 
     inbox.on('change:active_at', inbox.sort);
     inbox.on('change:unreadCount', function(model, count) {
-        var prev = model.previous('unreadCount');
+        var prev = model.previous('unreadCount') || 0;
         if (count < prev) { // decreased
-            var newUnreadCount = textsecure.storage.get("unreadCount") - (prev - count);
+            var newUnreadCount = textsecure.storage.get("unreadCount", 0) - (prev - count);
             if (newUnreadCount <= 0) {
                 newUnreadCount = 0;
                 extension.navigator.setBadgeText("");