diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 3dca7febf..ddc332bfd 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1058,14 +1058,16 @@ define([
                 onConnect: function (wc, sendMessage) {
                     channel.sendMessage = function (msg, cId, cb) {
                         // Send to server
-                        sendMessage(msg, cb);
-                        // Broadcast to other tabs
-                        channel.pushHistory(CpNfWorker.removeCp(msg), /^cp\|/.test(msg));
-                        channel.bcast("PAD_MESSAGE", {
-                            user: wc.myID,
-                            msg: CpNfWorker.removeCp(msg),
-                            validateKey: channel.data.validateKey
-                        }, cId);
+                        sendMessage(msg, function () {
+                            // Broadcast to other tabs
+                            channel.pushHistory(CpNfWorker.removeCp(msg), /^cp\|/.test(msg));
+                            channel.bcast("PAD_MESSAGE", {
+                                user: wc.myID,
+                                msg: CpNfWorker.removeCp(msg),
+                                validateKey: channel.data.validateKey
+                            }, cId);
+                            cb();
+                        });
                     };
                     channel.wc = wc;
                     channel.queue.forEach(function (data) {