diff --git a/lib/index.js b/lib/index.js
index 7f4df8286..910a7c651 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -152,14 +152,6 @@ class Embark {
           });
         }
         engine.startService("fileWatcher");
-
-        if (!options.useDashboard) {
-          const REPL = require('./dashboard/repl.js');
-          let repl = new REPL({env: engine.env});
-          repl.start(function () {
-            callback();
-          });
-        }
       }
     ], function (err, _result) {
       if (err) {
@@ -271,6 +263,7 @@ class Embark {
         engine.startService("deployment", {onlyCompile: false});
         engine.startService("storage");
         engine.startService("codeGenerator");
+        engine.startService("fileWatcher");
 
         callback();
       },
@@ -281,16 +274,14 @@ class Embark {
       },
       function waitForWriteFinish(callback) {
         engine.logger.info("Finished deploying".underline);
-        engine.events.on('outputDone', (err) => {
+        engine.events.once('outputDone', (err) => {
           engine.logger.info(__("finished building").underline);
           callback(err);
         });
       },
       function startREPL(callback) {
         let repl = new REPL({env: engine.env});
-        repl.start(function () {
-          callback();
-        });
+        repl.start(callback);
       }
     ], function (err, _result) {
       if (err) {