diff --git a/src/main/index.ts b/src/main/index.ts
index 992c8c46dd..14bdf34402 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -10,7 +10,7 @@ import * as Mobx from "mobx";
 import * as LensExtensionsCommonApi from "../extensions/common-api";
 import * as LensExtensionsMainApi from "../extensions/main-api";
 import { app, autoUpdater, dialog, powerMonitor } from "electron";
-import { appName, isIntegrationTesting, isMac, isWindows, productName } from "../common/vars";
+import { appName, isIntegrationTesting, isMac, isWindows, productName, isDevelopment } from "../common/vars";
 import { LensProxy } from "./lens-proxy";
 import { WindowManager } from "./window-manager";
 import { ClusterManager } from "./cluster-manager";
@@ -177,7 +177,6 @@ di.runSetups().then(() => {
       kubeApiRequest,
       shellApiRequest,
     });
-    const devServer = createDevServer(lensProxy.port);
 
     ClusterManager.createInstance().init();
 
@@ -185,10 +184,7 @@ di.runSetups().then(() => {
 
     try {
       logger.info("🔌 Starting LensProxy");
-      await Promise.all([
-        lensProxy.listen(),
-        devServer?.start(),
-      ]);
+      await lensProxy.listen(); // lensProxy.port available
     } catch (error) {
       dialog.showErrorBox("Lens Error", `Could not start proxy: ${error?.message || "unknown error"}`);
 
@@ -239,8 +235,11 @@ di.runSetups().then(() => {
 
     logger.info("🖥️  Starting WindowManager");
     const windowManager = WindowManager.createInstance();
-    if (devServer) {
-      // override main content view url to local webpack-dev-server to support HMR / live-reload
+
+    // Override main content view url to local webpack-dev-server to support HMR / live-reload
+    if (isDevelopment) {
+      const devServer = createDevServer(lensProxy.port);
+      await devServer.start();
       windowManager.mainContentUrl = `http://localhost:${devServer.options.port}`;
     }
 
diff --git a/webpack.dev-server.ts b/webpack.dev-server.ts
index 5aec8d46dd..0d73c37b88 100755
--- a/webpack.dev-server.ts
+++ b/webpack.dev-server.ts
@@ -6,7 +6,7 @@
 import Webpack from "webpack";
 import WebpackDevServer from "webpack-dev-server";
 import { webpackLensRenderer } from "./webpack.renderer";
-import { buildDir, isDevelopment, webpackDevServerPort } from "./src/common/vars";
+import { buildDir, webpackDevServerPort } from "./src/common/vars";
 import logger from "./src/common/logger";
 
 export interface DevServer extends WebpackDevServer {
@@ -18,11 +18,7 @@ export interface DevServer extends WebpackDevServer {
  * @url https://webpack.js.org/configuration/dev-server/
  * @url https://github.com/chimurai/http-proxy-middleware
  */
-export function createDevServer(lensProxyPort: number): DevServer | undefined {
-  if (!isDevelopment) {
-    return undefined;
-  }
-
+export function createDevServer(lensProxyPort: number): DevServer {
   const config = webpackLensRenderer();
   const compiler = Webpack(config);
 
diff --git a/webpack.renderer.ts b/webpack.renderer.ts
index d55f4b3799..eea29dd209 100755
--- a/webpack.renderer.ts
+++ b/webpack.renderer.ts
@@ -184,6 +184,4 @@ export function cssModulesWebpackRule(
   };
 }
 
-export default [
-  webpackLensRenderer,
-];
+export default webpackLensRenderer;