diff --git a/storm-webapp/package-lock.json b/storm-webapp/package-lock.json
index 412b4937e0..bb006e6390 100644
--- a/storm-webapp/package-lock.json
+++ b/storm-webapp/package-lock.json
@@ -13,7 +13,7 @@
         "cytoscape-dagre": "4.0.0",
         "dagre": "0.8.5",
         "datatables.net": "3.0.0",
-        "datatables.net-bs5": "2.3.8",
+        "datatables.net-bs5": "3.0.0",
         "datatables.net-dt": "3.0.0",
         "domurl": "2.3.4",
         "esprima": "4.0.1",
@@ -1819,22 +1819,12 @@
       "license": "MIT"
     },
     "node_modules/datatables.net-bs5": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-2.3.8.tgz",
-      "integrity": "sha512-TbFH99QSWm93Kn3teHLFKeyOqYbaiddlHvRFdXUwAvh/fjTMhACWmHG+I43ss8d23OEFHV0WIbN4lpPusZm5zw==",
-      "license": "MIT",
-      "dependencies": {
-        "datatables.net": "2.3.8",
-        "jquery": ">=1.7"
-      }
-    },
-    "node_modules/datatables.net-bs5/node_modules/datatables.net": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.8.tgz",
-      "integrity": "sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/datatables.net-bs5/-/datatables.net-bs5-3.0.0.tgz",
+      "integrity": "sha512-GkvSGsYfhO4lmaM1uyDOCNK5UY1VTr93km5Z6+t0iGM1l1PU4DGrjxFdFB+N5eTKRgGWvRsNng92sdIUfmkTsw==",
       "license": "MIT",
       "dependencies": {
-        "jquery": ">=1.7"
+        "datatables.net": "3.0.0"
       }
     },
     "node_modules/datatables.net-dt": {
diff --git a/storm-webapp/package.json b/storm-webapp/package.json
index d13d514992..eff3a5fff1 100644
--- a/storm-webapp/package.json
+++ b/storm-webapp/package.json
@@ -18,7 +18,7 @@
     "dagre": "0.8.5",
     "datatables.net": "3.0.0",
     "datatables.net-dt": "3.0.0",
-    "datatables.net-bs5": "2.3.8",
+    "datatables.net-bs5": "3.0.0",
     "domurl": "2.3.4",
     "esprima": "4.0.1",
     "jquery": "4.0.0",
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html
index 1a3b95ddb7..7bd80e224f 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/component.html
@@ -145,10 +145,10 @@
         $.extend( $.fn.dataTable.defaults, {
           stateSave: true,
           stateSaveCallback: function (oSettings, oData) {
-            sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), JSON.stringify(oData) );
+            sessionStorage.setItem( oSettings.tableId.concat(tableStateKey), JSON.stringify(oData) );
           },
           stateLoadCallback: function (oSettings) {
-            return JSON.parse( sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
+            return JSON.parse( sessionStorage.getItem(oSettings.tableId.concat(tableStateKey)) );
           },
           lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
           pageLength: response["ui.pagination"]
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html
index 3dfb2c32ad..08ef788974 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/topology.html
@@ -266,10 +266,10 @@ <h2 id="topology-resources-header">Topology resources</h2>
         $.extend( $.fn.dataTable.defaults, {
           stateSave: true,
           stateSaveCallback: function (oSettings, oData) {
-            sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), JSON.stringify(oData) );
+            sessionStorage.setItem( oSettings.tableId.concat(tableStateKey), JSON.stringify(oData) );
           },
           stateLoadCallback: function (oSettings) {
-            return JSON.parse( sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
+            return JSON.parse( sessionStorage.getItem(oSettings.tableId.concat(tableStateKey)) );
           },
           lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
           pageLength: response["ui.pagination"]