diff --git a/server/monitor-types/websocket-upgrade.js b/server/monitor-types/websocket-upgrade.js
index fe23745c6..4adb1f1e5 100644
--- a/server/monitor-types/websocket-upgrade.js
+++ b/server/monitor-types/websocket-upgrade.js
@@ -31,19 +31,23 @@ class WebSocketMonitorType extends MonitorType {
     async check(monitor, heartbeat, _server) {
         const [ message, code ] = await this.attemptUpgrade(monitor);
 
+        if (typeof code !== "undefined") {
+            // If returned status code matches user controlled accepted status code(default 1000), return success
+            if (checkStatusCode(code, JSON.parse(monitor.accepted_statuscodes_json))) {
+                heartbeat.status = UP;
+                heartbeat.msg = message;
+                return; //success at this point
+            }
+
+            // Throw an error using friendly name if defined, fallback to generic msg
+            throw new Error(WS_ERR_CODE[code] || `Unexpected status code: ${code}`);
+        }
         // If no close code, then an error has occurred, display to user
-        if (typeof code === "undefined") {
+        if (typeof message !== "undefined") {
             throw new Error(`${message}`);
         }
-        // If returned status code matches user controlled accepted status code(default 1000), return success
-        if (checkStatusCode(code, JSON.parse(monitor.accepted_statuscodes_json))) {
-            heartbeat.status = UP;
-            heartbeat.msg = message;
-            return; //success at this point
-        }
-
-        // Throw an error using friendly name if defined, fallback to generic msg
-        throw new Error(WS_ERR_CODE[code] || `Unexpected status code: ${code}`);
+        // Throw generic error if nothing is defined, should never happen
+        throw new Error("Unknown Websocket Error");
     }
 
     /**
@@ -54,8 +58,8 @@ class WebSocketMonitorType extends MonitorType {
     async attemptUpgrade(monitor) {
         return new Promise((resolve) => {
             let ws;
-            // If user inputs subprotocol(s), convert to array, then set Sec-WebSocket-Protocol header. Subprotocol Identifier column: https://www.iana.org/assignments/websocket/websocket.xml#subprotocol-name
-            ws = !monitor.wsSubprotocol ? new WebSocket(monitor.url) : new WebSocket(monitor.url, monitor.wsSubprotocol.replace(/\s/g, "").split(","));
+            // If user inputs subprotocol(s), convert to array, set Sec-WebSocket-Protocol header, timeout in ms. Subprotocol Identifier column: https://www.iana.org/assignments/websocket/websocket.xml#subprotocol-name
+            ws = !monitor.wsSubprotocol ? new WebSocket(monitor.url, { handshakeTimeout: (monitor?.timeout ?? 0) * 1000 }) : new WebSocket(monitor.url, monitor.wsSubprotocol.replace(/\s/g, "").split(","), { handshakeTimeout: (monitor?.timeout ?? 0) * 1000 });
 
             ws.addEventListener("open", (event) => {
                 // Immediately close the connection
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 55c551dd6..74b71e1a8 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -702,8 +702,8 @@
                                 </div>
                             </div>
 
-                            <!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP only -->
-                            <div v-if="monitor.type === 'http' || monitor.type === 'json-query' || monitor.type === 'keyword' || monitor.type === 'ping' || monitor.type === 'rabbitmq' || monitor.type === 'snmp'" class="my-3">
+                            <!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
+                            <div v-if="monitor.type === 'http' || monitor.type === 'json-query' || monitor.type === 'keyword' || monitor.type === 'ping' || monitor.type === 'rabbitmq' || monitor.type === 'snmp' || monitor.type === 'websocket-upgrade'" class="my-3">
                                 <label for="timeout" class="form-label">
                                     {{ monitor.type === 'ping' ? $t("pingGlobalTimeoutLabel") : $t("Request Timeout") }}
                                     <span v-if="monitor.type !== 'ping'">({{ $t("timeoutAfter", [monitor.timeout || clampTimeout(monitor.interval)]) }})</span>
diff --git a/test/backend-test/test-websocket.js b/test/backend-test/test-websocket.js
index fba894d44..ed12c2a1e 100644
--- a/test/backend-test/test-websocket.js
+++ b/test/backend-test/test-websocket.js
@@ -3,6 +3,24 @@ const { describe, test } = require("node:test");
 const assert = require("node:assert");
 const { WebSocketMonitorType } = require("../../server/monitor-types/websocket-upgrade");
 const { UP, PENDING } = require("../../src/util");
+const net = require("node:net");
+
+/**
+ * Simulates non compliant WS Server, doesnt send Sec-WebSocket-Accept header
+ * @param {number} port Port the server listens on. Defaults to 8080
+ * @returns {Promise} Promise that resolves to the created server once listening
+ */
+function nonCompliantWS(port = 8080) {
+    const srv = net.createServer((socket) => {
+        socket.once("data", (buf) => {
+            socket.write("HTTP/1.1 101 Switching Protocols\r\n" +
+                    "Upgrade: websocket\r\n" +
+                    "Connection: Upgrade\r\n\r\n");
+            socket.destroy();
+        });
+    });
+    return new Promise((resolve) => srv.listen(port, () => resolve(srv)));
+}
 
 describe("Websocket Test", {
 }, () => {
@@ -12,6 +30,7 @@ describe("Websocket Test", {
         const monitor = {
             url: "wss://example.org",
             wsIgnoreSecWebsocketAcceptHeader: false,
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -32,6 +51,7 @@ describe("Websocket Test", {
             url: "wss://echo.websocket.org",
             wsIgnoreSecWebsocketAcceptHeader: false,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -57,6 +77,7 @@ describe("Websocket Test", {
             url: "ws://localhost:8080",
             wsIgnoreSecWebsocketAcceptHeader: false,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -80,6 +101,7 @@ describe("Websocket Test", {
             url: "wss://echo.websocket.org",
             wsIgnoreSecWebsocketAcceptHeader: false,
             accepted_statuscodes_json: JSON.stringify([ "1001" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -93,13 +115,37 @@ describe("Websocket Test", {
         );
     });
 
-    test("Non compliant WS server without IgnoreSecWebsocket", async () => {
+    test("Secure WS Server no status code", async () => {
         const websocketMonitor = new WebSocketMonitorType();
 
         const monitor = {
-            url: "wss://c.img-cdn.net/yE4s7KehTFyj/",
+            url: "wss://echo.websocket.org",
+            wsIgnoreSecWebsocketAcceptHeader: false,
+            accepted_statuscodes_json: JSON.stringify([ "" ]),
+            timeout: 30,
+        };
+
+        const heartbeat = {
+            msg: "",
+            status: PENDING,
+        };
+
+        await assert.rejects(
+            websocketMonitor.check(monitor, heartbeat, {}),
+            new Error("Unexpected status code: 1000")
+        );
+    });
+
+    test("Non compliant WS server without IgnoreSecWebsocket", async (t) => {
+        t.after(() => wss.close());
+        const websocketMonitor = new WebSocketMonitorType();
+        const wss = await nonCompliantWS();
+
+        const monitor = {
+            url: "ws://localhost:8080",
             wsIgnoreSecWebsocketAcceptHeader: false,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -113,13 +159,16 @@ describe("Websocket Test", {
         );
     });
 
-    test("Non compliant WS server with IgnoreSecWebsocket", async () => {
+    test("Non compliant WS server with IgnoreSecWebsocket", async (t) => {
+        t.after(() => wss.close());
         const websocketMonitor = new WebSocketMonitorType();
+        const wss = await nonCompliantWS();
 
         const monitor = {
-            url: "wss://c.img-cdn.net/yE4s7KehTFyj/",
+            url: "ws://localhost:8080",
             wsIgnoreSecWebsocketAcceptHeader: true,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -143,6 +192,7 @@ describe("Websocket Test", {
             url: "wss://echo.websocket.org",
             wsIgnoreSecWebsocketAcceptHeader: true,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -166,6 +216,7 @@ describe("Websocket Test", {
             url: "wss://example.org",
             wsIgnoreSecWebsocketAcceptHeader: true,
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -187,6 +238,7 @@ describe("Websocket Test", {
             wsIgnoreSecWebsocketAcceptHeader: false,
             wsSubprotocol: "ocpp1.6",
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -200,14 +252,15 @@ describe("Websocket Test", {
         );
     });
 
-    test("Multiple subprotocols bad input", async () => {
+    test("Multiple subprotocols invalid input", async () => {
         const websocketMonitor = new WebSocketMonitorType();
 
         const monitor = {
             url: "wss://echo.websocket.org",
             wsIgnoreSecWebsocketAcceptHeader: false,
-            wsSubprotocol: "    ocpp2.0     ,     ocpp1.6 ,             ",
+            wsSubprotocol: "  # &  ,ocpp2.0   []  ,     ocpp1.6 ,  ,,     ;      ",
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {
@@ -221,6 +274,37 @@ describe("Websocket Test", {
         );
     });
 
+    test("Insecure WS subprotocol multiple spaces", async (t) => {
+        t.after(() => wss.close());
+        const websocketMonitor = new WebSocketMonitorType();
+        const wss = new WebSocketServer({ port: 8080,
+            handleProtocols: (protocols) => {
+                return Array.from(protocols).includes("test") ? "test" : null;
+            }
+        });
+
+        const monitor = {
+            url: "ws://localhost:8080",
+            wsIgnoreSecWebsocketAcceptHeader: false,
+            wsSubprotocol: "invalid                        ,              test  ",
+            accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
+        };
+
+        const heartbeat = {
+            msg: "",
+            status: PENDING,
+        };
+
+        const expected = {
+            msg: "1000 - OK",
+            status: UP,
+        };
+
+        await websocketMonitor.check(monitor, heartbeat, {});
+        assert.deepStrictEqual(heartbeat, expected);
+    });
+
     test("Insecure WS support one subprotocol", async (t) => {
         t.after(() => wss.close());
         const websocketMonitor = new WebSocketMonitorType();
@@ -235,6 +319,7 @@ describe("Websocket Test", {
             wsIgnoreSecWebsocketAcceptHeader: false,
             wsSubprotocol: "invalid,test",
             accepted_statuscodes_json: JSON.stringify([ "1000" ]),
+            timeout: 30,
         };
 
         const heartbeat = {