diff --git a/lib/index.js b/lib/index.js
index 1f604690b..860cd3dd3 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -65,6 +65,17 @@ class Embark {
     self.context = options.context || [constants.contexts.run, constants.contexts.build];
     let Dashboard = require('./dashboard/dashboard.js');
 
+      let webServerConfig = {
+          enabled: options.runWebserver
+      };
+
+      if (options.serverHost) {
+          webServerConfig.host = options.serverHost;
+      }
+      if (options.serverPort) {
+          webServerConfig.port = options.serverPort;
+      }
+
     const Engine = require('./core/engine.js');
     const engine = new Engine({
       env: options.env,
@@ -76,11 +87,7 @@ class Embark {
       logLevel: options.logLevel,
       context: self.context,
       useDashboard: options.useDashboard,
-      webServerConfig: {
-        enabled: options.runWebserver,
-        host: options.serverHost,
-        port: options.serverPort
-      }
+      webServerConfig: webServerConfig
     });
     engine.init();