diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 29f0005b5..4ecf2e9f8 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38283,6 +38283,10 @@ MessageReceiver.prototype.extend({
         });
 
         this.pending = this.queueAllCached();
+
+        // Ensures that an immediate 'empty' event from the websocket will fire only after
+        //   all cached envelopes are processed.
+        this.incoming = [this.pending];
     },
     close: function() {
         this.socket.close(3000, 'called close');
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 8a6d58c8a..9afb5e034 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -34,6 +34,10 @@ MessageReceiver.prototype.extend({
         });
 
         this.pending = this.queueAllCached();
+
+        // Ensures that an immediate 'empty' event from the websocket will fire only after
+        //   all cached envelopes are processed.
+        this.incoming = [this.pending];
     },
     close: function() {
         this.socket.close(3000, 'called close');