diff --git a/client/cloudcmd.js b/client/cloudcmd.js
index 0e8a603e..db23f2ad 100644
--- a/client/cloudcmd.js
+++ b/client/cloudcmd.js
@@ -4,7 +4,7 @@
 window.exec = require('execon');
 
 // prevent additional loading of emitify
-window.Emitify = require('emitify');
+window.Emitify = require('emitify/legacy');
 
 window.CloudCmd = (config) => {
     window.Promise = window.Promise || require('es6-promise');
diff --git a/client/dom/load.js b/client/dom/load.js
index bbac476c..bc09f3d8 100644
--- a/client/dom/load.js
+++ b/client/dom/load.js
@@ -2,7 +2,7 @@
 
 const itype = require('itype/legacy');
 const jonny = require('jonny');
-const Emitify = require('emitify');
+const Emitify = require('emitify/legacy');
 const exec = require('execon');
 const Images = require('./images');
 const Events = require('./events');
diff --git a/package.json b/package.json
index 87ff293e..85c737ca 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,8 @@
   "scripts": {
     "start": "node bin/cloudcmd.js",
     "start:dev": "NODE_ENV=development node bin/cloudcmd.js",
+    "build:start": "redrun build:client start",
+    "build:start:dev": "redrun build:client:dev start:dev",
     "security": "nsp check",
     "codestyle": "redrun lint spell",
     "lint": "redrun lint:*",
@@ -160,7 +162,7 @@
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-es2015": "^6.18.0",
     "coveralls": "^2.11.6",
-    "emitify": "^2.1.1",
+    "emitify": "^3.0.2",
     "es6-promise": "^4.0.5",
     "es6-promisify": "^5.0.0",
     "eslint": "^3.1.1",