diff --git a/lib/index.js b/lib/index.js
index 1f73d7710..9e5a485fb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -202,13 +202,20 @@ class Embark {
         engine.deployManager.deployContracts(function (err) {
           callback(err);
         });
+      },
+      function waitForWriteFinish(callback) {
+        engine.logger.info("Finished deploying".underline);
+        // Necessary log for simple projects. This event is trigger to soon because there is no file
+        // Also, not exiting straight after the deploy leaves time for async afterDeploys to finish
+        engine.logger.info("If you have no files to build, you can exit now with CTRL+C");
+        engine.events.on('outputDone', callback);
       }
     ], function (err, _result) {
       if (err) {
         engine.logger.error(err.message);
         engine.logger.debug(err.stack);
       } else {
-        engine.logger.info("finished building".underline);
+        engine.logger.info("Finished building".underline);
       }
       // needed due to child processes
       process.exit();