diff --git a/lib/index.js b/lib/index.js
index 7c2cb73e..66c792af 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -208,9 +208,6 @@ class Embark {
           return callback(null, true);
         }
         engine.logger.info("Finished deploying".underline);
-        if (!engine.config.assetFiles || !Object.keys(engine.config.assetFiles).length) {
-          return callback();
-        }
         engine.events.on('outputDone', (err) => {
           engine.logger.info(__("finished building").underline);
           callback(err, true);
diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js
index 7d7a0e54..16d37f6a 100644
--- a/lib/pipeline/pipeline.js
+++ b/lib/pipeline/pipeline.js
@@ -4,7 +4,6 @@ const ProcessLauncher = require('../process/processLauncher');
 const utils = require('../utils/utils.js');
 const constants = require('../constants');
 
-
 require("babel-preset-react");
 require("babel-preset-es2015");
 require("babel-preset-es2016");
@@ -27,6 +26,10 @@ class Pipeline {
     const importsList = {};
     let placeholderPage;
 
+    if (!this.assetFiles || !Object.keys(this.assetFiles).length) {
+      return callback();
+    }
+
     async.waterfall([
       function createPlaceholderPage(next){
         self.events.request('embark-building-placeholder', (html) => {