webpack
diff --git a/‎lib/Server.js
Lines changed: 19 additions & 17 deletions b/‎lib/Server.js
Lines changed: 19 additions & 17 deletions
diff --git a/‎lib/utils/DevServerPlugin.js
Lines changed: 2 additions & 1 deletion b/‎lib/utils/DevServerPlugin.js
Lines changed: 2 additions & 1 deletion
@@ -718,7 +718,7 @@ class Server {
           this.options.port,
           this.options.host,
           (error) => {
-            if (this.options.hot || this.options.liveReload) {
+            if (Boolean(this.options.hot) || this.options.liveReload) {
               this.createWebSocketServer();
             }
 
@@ -936,26 +936,28 @@ class Server {
   }
 
   serveMagicHtml(req, res, next) {
-    const _path = req.path;
+    this.middleware.waitUntilValid(() => {
+      const _path = req.path;
 
-    try {
-      const filename = this.middleware.getFilenameFromUrl(`${_path}.js`);
-      const isFile = this.middleware.context.outputFileSystem
-        .statSync(filename)
-        .isFile();
+      try {
+        const filename = this.middleware.getFilenameFromUrl(`${_path}.js`);
+        const isFile = this.middleware.context.outputFileSystem
+          .statSync(filename)
+          .isFile();
 
-      if (!isFile) {
-        return next();
-      }
+        if (!isFile) {
+          return next();
+        }
 
-      // Serve a page that executes the javascript
-      const queries = req._parsedUrl.search || '';
-      const responsePage = `<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body><script type="text/javascript" charset="utf-8" src="${_path}.js${queries}"></script></body></html>`;
+        // Serve a page that executes the javascript
+        const queries = req._parsedUrl.search || '';
+        const responsePage = `<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body><script type="text/javascript" charset="utf-8" src="${_path}.js${queries}"></script></body></html>`;
 
-      res.send(responsePage);
-    } catch (error) {
-      return next();
-    }
+        res.send(responsePage);
+      } catch (error) {
+        return next();
+      }
+    });
   }
 
   // Send stats to a socket or multiple sockets
 
@@ -214,7 +214,8 @@ class DevServerPlugin {
       checkInject(
         this.options.client ? this.options.client.needClientEntry : null,
         compiler.options,
-        this.isWebTarget(compiler.options)
+        this.isWebTarget(compiler.options) &&
+          (Boolean(this.options.hot) || this.options.liveReload)
       )
     ) {
       additionalEntries.push(clientEntry);