diff --git a/src/api/dev.ts b/src/api/dev.ts
index 6c70a71..0b92097 100644
--- a/src/api/dev.ts
+++ b/src/api/dev.ts
@@ -148,10 +148,6 @@ class Watcher extends EventEmitter {
 				fs.writeFileSync(path.join(dest, 'server_info.json'), JSON.stringify(info, null, '  '));
 
 				this.deferreds.client.promise.then(() => {
-					this.dev_server.send({
-						status: 'completed'
-					});
-
 					const restart = () => {
 						ports.wait(this.port).then((() => {
 							this.emit('ready', <events.ReadyEvent>{
@@ -160,6 +156,10 @@ class Watcher extends EventEmitter {
 							});
 
 							this.deferreds.server.fulfil();
+
+							this.dev_server.send({
+								status: 'completed'
+							});
 						}));
 					};