diff --git a/homeassistant/components/zwave_js/diagnostics.py b/homeassistant/components/zwave_js/diagnostics.py
index 50130fc2632..acb87a239ae 100644
--- a/homeassistant/components/zwave_js/diagnostics.py
+++ b/homeassistant/components/zwave_js/diagnostics.py
@@ -117,7 +117,8 @@ async def async_get_config_entry_diagnostics(
     handshake_msgs = msgs[:-1]
     network_state = msgs[-1]
     network_state["result"]["state"]["nodes"] = [
-        redact_node_state(node) for node in network_state["result"]["state"]["nodes"]
+        redact_node_state(async_redact_data(node, KEYS_TO_REDACT))
+        for node in network_state["result"]["state"]["nodes"]
     ]
     return {"messages": [*handshake_msgs, network_state]}
 
@@ -136,7 +137,6 @@ async def async_get_device_diagnostics(
     entities = get_device_entities(hass, node, device)
     assert client.version
     node_state = redact_node_state(async_redact_data(node.data, KEYS_TO_REDACT))
-    node_state["statistics"] = node.statistics.data
     return {
         "versionInfo": {
             "driverVersion": client.version.driver_version,
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index a21f7a6f30b..0ad934103d6 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -8,7 +8,7 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["zwave_js_server"],
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.46.0"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.47.0"],
   "usb": [
     {
       "vid": "0658",
diff --git a/requirements_all.txt b/requirements_all.txt
index 134bc6f4596..cf3fbc10f4d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2728,7 +2728,7 @@ zigpy==0.53.2
 zm-py==0.5.2
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.46.0
+zwave-js-server-python==0.47.0
 
 # homeassistant.components.zwave_me
 zwave_me_ws==0.3.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 977c2896c0a..f1a499c45dd 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1950,7 +1950,7 @@ zigpy-znp==0.9.3
 zigpy==0.53.2
 
 # homeassistant.components.zwave_js
-zwave-js-server-python==0.46.0
+zwave-js-server-python==0.47.0
 
 # homeassistant.components.zwave_me
 zwave_me_ws==0.3.1
diff --git a/tests/components/zwave_js/test_api.py b/tests/components/zwave_js/test_api.py
index 43489be4ccf..f8a7a68f139 100644
--- a/tests/components/zwave_js/test_api.py
+++ b/tests/components/zwave_js/test_api.py
@@ -3201,6 +3201,7 @@ async def test_subscribe_log_updates(
             "multiline": False,
             "timestamp": "time",
             "label": "label",
+            "context": {"source": "config"},
         },
     )
     client.driver.receive_event(event)
diff --git a/tests/components/zwave_js/test_diagnostics.py b/tests/components/zwave_js/test_diagnostics.py
index e3c144c4ac6..773b799cd6f 100644
--- a/tests/components/zwave_js/test_diagnostics.py
+++ b/tests/components/zwave_js/test_diagnostics.py
@@ -92,16 +92,7 @@ async def test_device_diagnostics(
     assert len(diagnostics_data["entities"]) == len(
         list(async_discover_node_values(multisensor_6, device, {device.id: set()}))
     )
-    assert diagnostics_data["state"] == {
-        **multisensor_6.data,
-        "statistics": {
-            "commandsDroppedRX": 0,
-            "commandsDroppedTX": 0,
-            "commandsRX": 0,
-            "commandsTX": 0,
-            "timeoutResponse": 0,
-        },
-    }
+    assert diagnostics_data["state"] == multisensor_6.data
 
 
 async def test_device_diagnostics_error(hass: HomeAssistant, integration) -> None:
diff --git a/tests/components/zwave_js/test_trigger.py b/tests/components/zwave_js/test_trigger.py
index 9ba00806674..cbf68a55f5a 100644
--- a/tests/components/zwave_js/test_trigger.py
+++ b/tests/components/zwave_js/test_trigger.py
@@ -601,7 +601,8 @@ async def test_zwave_js_event(
         },
     )
 
-    # Test that `node no event data filter` is triggered and `node event data filter` is not
+    # Test that `node no event data filter` is triggered and `node event data
+    # filter` is not
     event = Event(
         type="interview stage completed",
         data={
@@ -649,7 +650,8 @@ async def test_zwave_js_event(
 
     clear_events()
 
-    # Test that `controller no event data filter` is triggered and `controller event data filter` is not
+    # Test that `controller no event data filter` is triggered and `controller event
+    # data filter` is not
     event = Event(
         type="inclusion started",
         data={
@@ -672,7 +674,8 @@ async def test_zwave_js_event(
 
     clear_events()
 
-    # Test that both `controller no event data filter` and `controller event data filter` are triggered
+    # Test that both `controller no event data filter` and `controller event data
+    # filter`` are triggered
     event = Event(
         type="inclusion started",
         data={
@@ -695,7 +698,8 @@ async def test_zwave_js_event(
 
     clear_events()
 
-    # Test that `driver no event data filter` is triggered and `driver event data filter` is not
+    # Test that `driver no event data filter` is triggered and `driver event data
+    # filter` is not
     event = Event(
         type="logging",
         data={
@@ -711,6 +715,7 @@ async def test_zwave_js_event(
             "multiline": False,
             "timestamp": "time",
             "label": "label",
+            "context": {"source": "config"},
         },
     )
     client.driver.receive_event(event)
@@ -727,7 +732,8 @@ async def test_zwave_js_event(
 
     clear_events()
 
-    # Test that both `driver no event data filter` and `driver event data filter` are triggered
+    # Test that both `driver no event data filter` and `driver event data filter`
+    # are triggered
     event = Event(
         type="logging",
         data={
@@ -743,6 +749,7 @@ async def test_zwave_js_event(
             "multiline": False,
             "timestamp": "time",
             "label": "label",
+            "context": {"source": "config"},
         },
     )
     client.driver.receive_event(event)
@@ -862,7 +869,8 @@ async def test_zwave_js_event_bypass_dynamic_validation(
             },
         )
 
-    # Test that `node no event data filter` is triggered and `node event data filter` is not
+    # Test that `node no event data filter` is triggered and `node event data filter`
+    # is not
     event = Event(
         type="interview stage completed",
         data={