diff --git a/src/main/routes/port-forward-route.ts b/src/main/routes/port-forward-route.ts
index 70f6b70261..56934628dd 100644
--- a/src/main/routes/port-forward-route.ts
+++ b/src/main/routes/port-forward-route.ts
@@ -134,12 +134,10 @@ export class PortForwardRoute {
       if (!portForward) {
         logger.info(`Creating a new port-forward ${namespace}/${resourceType}/${resourceName}:${port}`);
 
-        let thePort = 0;
-
-        if (forwardPort > 0 && forwardPort < 65536) {
-          thePort = forwardPort;
-        }
-
+        const thePort = 0 < forwardPort && forwardPort < 65536 
+          ? forwardPort 
+          : 0;
+          
         portForward = new PortForward(await cluster.getProxyKubeconfigPath(), {
           clusterId: cluster.id,
           kind: resourceType,
diff --git a/src/renderer/port-forward/port-forward-dialog.tsx b/src/renderer/port-forward/port-forward-dialog.tsx
index cf7442ceea..b577e99e71 100644
--- a/src/renderer/port-forward/port-forward-dialog.tsx
+++ b/src/renderer/port-forward/port-forward-dialog.tsx
@@ -61,7 +61,7 @@ export class PortForwardDialog extends Component<Props> {
   static open(portForward: ForwardedPort, options: PortForwardDialogOpenOptions = { openInBrowser: false }) {
     dialogState.isOpen = true;
     dialogState.data = portForward;
-    dialogState.useHttps = Boolean(portForward.protocol === "https");
+    dialogState.useHttps = portForward.protocol === "https";
     dialogState.openInBrowser = options.openInBrowser;
   }