diff --git a/src/Connector.js b/src/Connector.js
index f3fbced6..cde7f81f 100644
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -240,11 +240,7 @@ export default function extendConnector (Y/* :any */) {
       }
       if (this.broadcastOpBuffer.length === 0) {
         this.broadcastOpBuffer = ops
-        if (this.y.db.transactionInProgress) {
-          this.y.db.whenTransactionsFinished().then(broadcastOperations)
-        } else {
-          setTimeout(broadcastOperations, 0)
-        }
+        this.y.db.whenTransactionsFinished().then(broadcastOperations)
       } else {
         this.broadcastOpBuffer = this.broadcastOpBuffer.concat(ops)
       }
@@ -365,6 +361,7 @@ export default function extendConnector (Y/* :any */) {
               */
               defer.resolve()
             })
+            return this.syncStep2
           } else if (message.type === 'sync done') {
             var self = this
             this.syncStep2.then(function () {
diff --git a/src/y.js b/src/y.js
index b96acc09..4152e28b 100644
--- a/src/y.js
+++ b/src/y.js
@@ -132,16 +132,14 @@ export default function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
       opts.connector = Y.utils.copyObject(opts.connector)
       opts.db = Y.utils.copyObject(opts.db)
       opts.share = Y.utils.copyObject(opts.share)
-      setTimeout(function () {
-        Y.requestModules(modules).then(function () {
-          var yconfig = new YConfig(opts)
-          yconfig.db.whenUserIdSet(function () {
-            yconfig.init(function () {
-              resolve(yconfig)
-            })
+      Y.requestModules(modules).then(function () {
+        var yconfig = new YConfig(opts)
+        yconfig.db.whenUserIdSet(function () {
+          yconfig.init(function () {
+            resolve(yconfig)
           })
-        }).catch(reject)
-      }, 0)
+        })
+      }).catch(reject)
     }
   })
 }