diff --git a/lib/index.js b/lib/index.js
index be2a2eb6c..a773dafe1 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -203,6 +203,13 @@ class Embark {
         engine.events.request('deploy:contracts', 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) {