diff --git a/lib/dispatch/beacon.js b/lib/dispatch/beacon.js
index 85d9600c..9758c8e4 100644
--- a/lib/dispatch/beacon.js
+++ b/lib/dispatch/beacon.js
@@ -65,9 +65,7 @@ etl.verify = function (context, workspace, collection, documents, callback) {
     joola.dispatch.collections.metadata(context, workspace, null, _document, function (err, meta) {
       /* istanbul ignore if */
       if (err)
-        return setImmediate(function () {
-          return callback(err);
-        });
+        return callback(err);
 
       joola.dispatch.collections.get(context, workspace, collection, function (err, _collection) {
         if (err) {
@@ -77,30 +75,22 @@ etl.verify = function (context, workspace, collection, documents, callback) {
           joola.dispatch.collections.add(context, workspace, meta, function (err, _collection) {
             /* istanbul ignore if */
             if (err && err.message != 'Collection already exist') {
-              return setImmediate(function () {
-                return callback(err);
-              });
+              return callback(err);
             }
             joola.dispatch.collections.get(context, workspace, collection, function (err, _collection) {
               if (err) {
-                return setImmediate(function () {
-                  return callback(err);
-                });
+                return callback(err);
               }
               if (joola.datastore.providers.default.addcollection) {
                 joola.datastore.providers.default.addcollection(meta.key, meta, function (err) {
                   if (err)
                     return callback(err);
 
-                  return setImmediate(function () {
-                    return callback(null);
-                  });
+                  return callback(null);
                 });
               }
               else {
-                return setImmediate(function () {
-                  return callback(null);
-                });
+                return callback(null);
               }
             });
           });
@@ -109,9 +99,7 @@ etl.verify = function (context, workspace, collection, documents, callback) {
           joola.dispatch.collections.metadata(context, workspace, collection, _document, function (err, _meta) {
             /* istanbul ignore if */
             if (err)
-              return setImmediate(function () {
-                return callback(err);
-              });
+              return callback(err);
 
             var differences;
             delete meta._key;
@@ -147,22 +135,16 @@ etl.verify = function (context, workspace, collection, documents, callback) {
                   joola.datastore.providers.default.altercollection(meta.key, meta, differences, function (err) {
                     if (err)
                       return callback(err);
-                    return setImmediate(function () {
-                      return callback(null);
-                    });
+                    return callback(null);
                   });
                 }
                 else {
-                  return setImmediate(function () {
-                    return callback(null);
-                  });
+                  return callback(null);
                 }
               });
             }
             else {
-              return setImmediate(function () {
-                return callback(null);
-              });
+              return callback(null);
             }
           });
         }
@@ -174,9 +156,7 @@ etl.verify = function (context, workspace, collection, documents, callback) {
 etl.load = function (context, workspace, collection, documents, options, callback) {
   joola.dispatch.collections.metadata(context, workspace, collection, ce.clone(documents[0]), function (err, meta, _collection) {
     if (err)
-      return setImmediate(function () {
-        return callback(err);
-      });
+      return callback(err);
 
     _collection.meta = meta;
     _collection.storeKey = (workspace + '_' + collection).replace(/[^\w\s]/gi, '');
@@ -332,24 +312,22 @@ exports.insert = {
           if (err)
             return callback(err);
 
-          return setImmediate(function () {
-            var end_ts = new Date().getTime();
-            if (count > 1)
-              joola.logger.trace('Beacon insert, count: ' + count + ', total: ' + (end_ts - start_ts) + 'ms, rate: ' + (count / (end_ts - start_ts)) + 'doc/ms');
+          var end_ts = new Date().getTime();
+          if (count > 1)
+            joola.logger.trace('Beacon insert, count: ' + count + ', total: ' + (end_ts - start_ts) + 'ms, rate: ' + (count / (end_ts - start_ts)) + 'doc/ms');
 
-            //if (workspace != '_stats')
+          //if (workspace != '_stats')
 //              joola.stats.emit({event: 'writes', workspace: workspace, username: context.user.username, collection: collection, writeCount: count, duration_per_doc: (count / (end_ts - start_ts))});
 
-            subscribers.forEach(function (subscriber, i) {
-              if (subscriber.disconnected)
-                subscribers.splice(i, 1);
-              else {
-                subscriber.emit('event', collection, documents);
-              }
-            });
-
-            return callback(null, documents);
+          subscribers.forEach(function (subscriber, i) {
+            if (subscriber.disconnected)
+              subscribers.splice(i, 1);
+            else {
+              subscriber.emit('event', collection, documents);
+            }
           });
+
+          return callback(null, documents);
         });
       });
     }