diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 87a9d226b..d675c8ff9 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -33,9 +33,7 @@ MessageReceiver.prototype.extend({
             keepalive: { path: '/v1/keepalive', disconnect: true }
         });
 
-        this.pending = Promise.resolve();
-
-        this.queueAllCached();
+        this.pending = this.queueAllCached();
     },
     close: function() {
         this.socket.close(3000, 'called close');
@@ -156,7 +154,7 @@ MessageReceiver.prototype.extend({
         this.dispatchEvent(ev);
     },
     queueAllCached: function() {
-        this.getAllFromCache().then(function(items) {
+        return this.getAllFromCache().then(function(items) {
             for (var i = 0, max = items.length; i < max; i += 1) {
                 this.queueCached(items[i]);
             }