diff --git a/lib/server.js b/lib/server.js
index 0230c2e53..3efbebeb8 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -198,7 +198,10 @@ var start = function(injector, config, launcher, globalEmitter, preprocess, file
     });
 
     globalEmitter.emitAsync('exit').then(function() {
-      done(code || 0);
+      // All systems down, stop the webserver
+      webServer.close(function () {
+        done(code || 0);
+      });
     });
   };