diff --git a/packages/cli/src/commands/develop.js b/packages/cli/src/commands/develop.js
index b879b8229..55c54ef9a 100644
--- a/packages/cli/src/commands/develop.js
+++ b/packages/cli/src/commands/develop.js
@@ -27,9 +27,9 @@ module.exports = runDevServer = async () => {
           return provider;
         })];
 
-        servers.forEach((server) => {
-          server.start();
-        });
+        return Promise.all(servers.map(async (server) => {
+          return server.start();
+        }));
       });
     } catch (err) {
       reject(err);
diff --git a/packages/cli/src/lifecycles/serve.js b/packages/cli/src/lifecycles/serve.js
index aef4cb878..8faa1773f 100644
--- a/packages/cli/src/lifecycles/serve.js
+++ b/packages/cli/src/lifecycles/serve.js
@@ -89,13 +89,13 @@ function getDevServer(compilation) {
   // allow intercepting of urls
   app.use(async (ctx) => {
     const modifiedResources = resources.concat(
-      pluginNodeModules.provider(compilation),
-      pluginLiveReloadResource.provider(compilationCopy)
+      pluginLiveReloadResource.provider(compilation)
     );
 
     const reducedResponse = await modifiedResources.reduce(async (responsePromise, resource) => {
       const body = await responsePromise;
-      const { url, headers } = ctx;
+      const { url } = ctx;
+      const { headers } = ctx.response;
       const shouldIntercept = await resource.shouldIntercept(url, body, headers);
 
       if (shouldIntercept) {
diff --git a/packages/cli/src/plugins/server/plugin-livereload.js b/packages/cli/src/plugins/server/plugin-livereload.js
index e70c3ef2d..24ea910e7 100644
--- a/packages/cli/src/plugins/server/plugin-livereload.js
+++ b/packages/cli/src/plugins/server/plugin-livereload.js
@@ -26,20 +26,16 @@ class LiveReloadServer extends ServerInterface {
 class LiveReloadResource extends ResourceInterface {
   
   async shouldIntercept(url) {
-    return Promise.resolve(path.extname(url) === '');
+    return Promise.resolve(path.extname(url) === '' && process.env.__GWD_COMMAND__ === 'develop'); // eslint-disable-line no-underscore-dangle
   }
 
-  async intercept(body) {
+  async intercept(url, body) {
     return new Promise((resolve, reject) => {
       try {
-        let contents = body;
-
-        if (process.env.__GWD_COMMAND__ === 'develop') { // eslint-disable-line no-underscore-dangle
-          contents = contents.replace('</head>', `
-              <script src="http://localhost:35729/livereload.js?snipver=1"></script>
-            </head>
-          `);
-        }
+        const contents = body.replace('</head>', `
+            <script src="http://localhost:35729/livereload.js?snipver=1"></script>
+          </head>
+        `);
 
         resolve(contents);
       } catch (e) {