diff --git a/webapp/boards/webpack.config.js b/webapp/boards/webpack.config.js
index 40942c5aa3..7951f5e8e0 100644
--- a/webapp/boards/webpack.config.js
+++ b/webapp/boards/webpack.config.js
@@ -189,17 +189,24 @@ config.plugins.push(new webpack.DefinePlugin({
 if (NPM_TARGET === 'start:product') {
     const url = new URL(process.env.MM_BOARDS_DEV_SERVER_URL ?? 'http://localhost:9006');
 
+    const protocol = url.protocol.substring(0, url.protocol.length - 1);
+    const hostname = url.hostname;
+    let port = url.port;
+    if (!port) {
+        port = protocol === 'https' ? '443' : '80';
+    }
+
     config.devServer = {
         server: {
-            type: url.protocol.substring(0, url.protocol.length - 1),
+            type: protocol,
             options: {
                 minVersion: process.env.MM_SERVICESETTINGS_TLSMINVER ?? 'TLSv1.2',
                 key: process.env.MM_SERVICESETTINGS_TLSKEYFILE,
                 cert: process.env.MM_SERVICESETTINGS_TLSCERTFILE,
             },
         },
-        host: url.hostname,
-        port: url.port,
+        host: hostname,
+        port,
         devMiddleware: {
             writeToDisk: false,
         },
diff --git a/webapp/playbooks/webpack.config.js b/webapp/playbooks/webpack.config.js
index 3cddf1645f..218d46ccb8 100644
--- a/webapp/playbooks/webpack.config.js
+++ b/webapp/playbooks/webpack.config.js
@@ -137,17 +137,24 @@ config.output = {
 if (NPM_TARGET === 'start:product') {
     const url = new URL(process.env.MM_PLAYBOOKS_DEV_SERVER_URL ?? 'http://localhost:9007');
 
+    const protocol = url.protocol.substring(0, url.protocol.length - 1);
+    const hostname = url.hostname;
+    let port = url.port;
+    if (!port) {
+        port = protocol === 'https' ? '443' : '80';
+    }
+
     config.devServer = {
         server: {
-            type: url.protocol.substring(0, url.protocol.length - 1),
+            type: protocol,
             options: {
                 minVersion: process.env.MM_SERVICESETTINGS_TLSMINVER ?? 'TLSv1.2',
                 key: process.env.MM_SERVICESETTINGS_TLSKEYFILE,
                 cert: process.env.MM_SERVICESETTINGS_TLSCERTFILE,
             },
         },
-        host: url.hostname,
-        port: url.port,
+        host: hostname,
+        port,
         devMiddleware: {
             writeToDisk: false,
         },