diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml
index fc2c6007eae..50b71368c74 100644
--- a/.github/workflows/cypress-tests.yml
+++ b/.github/workflows/cypress-tests.yml
@@ -17,11 +17,11 @@ name: Cypress E2E Tests
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "master", "2.x" ]
     paths:
       - 'storm-webapp/**'
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "2.x" ]
     paths:
       - 'storm-webapp/**'
   workflow_dispatch:
diff --git a/pom.xml b/pom.xml
index 452d45f72e2..a1c1eaea684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
         <jgrapht.version>1.5.3</jgrapht.version>
         <guava.version>33.6.0-jre</guava.version>
         <auto-service.version>1.1.1</auto-service.version>
-        <netty-tcnative.version>2.0.77.Final</netty-tcnative.version>
+        <netty-tcnative.version>2.0.80.Final</netty-tcnative.version>
         <netty.version>4.2.15.Final</netty.version>
         <sysout-over-slf4j.version>1.0.2</sysout-over-slf4j.version>
         <log4j.version>2.26.0</log4j.version>
diff --git a/storm-webapp/package-lock.json b/storm-webapp/package-lock.json
index 05cc6b26799..9777b69b589 100644
--- a/storm-webapp/package-lock.json
+++ b/storm-webapp/package-lock.json
@@ -20,7 +20,7 @@
         "jquery": "4.0.0",
         "jquery-blockui": "2.7.0",
         "js-cookie": "3.0.8",
-        "js-yaml": "4.2.0",
+        "js-yaml": "5.2.0",
         "moment": "2.30.1",
         "mustache": "4.2.0",
         "typeahead.js": "0.11.1",
@@ -3123,9 +3123,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.0.tgz",
+      "integrity": "sha512-YeLUMlvR4Ou1B119LIaM0r65JvbOBooJDc9yEu0dClb/uSC5P4FrLU8OCCz/HXWvtPoIrR0dRzABTjo1sTN9Bw==",
       "funding": [
         {
           "type": "github",
@@ -3141,7 +3141,7 @@
         "argparse": "^2.0.1"
       },
       "bin": {
-        "js-yaml": "bin/js-yaml.js"
+        "js-yaml": "bin/js-yaml.mjs"
       }
     },
     "node_modules/jsbn": {
diff --git a/storm-webapp/package.json b/storm-webapp/package.json
index 1af031636b2..3765ad54e34 100644
--- a/storm-webapp/package.json
+++ b/storm-webapp/package.json
@@ -24,7 +24,7 @@
     "jquery": "4.0.0",
     "jquery-blockui": "2.7.0",
     "js-cookie": "3.0.8",
-    "js-yaml": "4.2.0",
+    "js-yaml": "5.2.0",
     "moment": "2.30.1",
     "mustache": "4.2.0",
     "typeahead.js": "0.11.1",
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
index ad676c17a78..9d869992135 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html
@@ -70,7 +70,14 @@
 
       function parseAndRender() {
         var input = document.getElementById('taInput').value;
-        var doc = jsyaml.load(input);
+        var doc;
+        try {
+          doc = jsyaml.load(input);
+        } catch (e) {
+          // js-yaml >=5 throws on empty/comment-only input instead of
+          // returning undefined (see migrate_v4_to_v5); treat as no document.
+          return;
+        }
 	if(doc==null){
 	   return;
 	}