From 39d323186fedb7617502d0ab45e27a5b602770d9 Mon Sep 17 00:00:00 2001
From: Petar Petrov <MindFreeze@users.noreply.github.com>
Date: Fri, 18 Jul 2025 10:53:47 +0300
Subject: [PATCH] Disable "last seen" Z-Wave entity by default (#148987)

---
 homeassistant/components/zwave_js/sensor.py |  2 +-
 tests/components/zwave_js/test_init.py      |  8 ++++----
 tests/components/zwave_js/test_sensor.py    | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py
index df0a701bf15..2efb8c8e67c 100644
--- a/homeassistant/components/zwave_js/sensor.py
+++ b/homeassistant/components/zwave_js/sensor.py
@@ -558,7 +558,7 @@ ENTITY_DESCRIPTION_NODE_STATISTICS_LIST = [
         key="last_seen",
         translation_key="last_seen",
         device_class=SensorDeviceClass.TIMESTAMP,
-        entity_registry_enabled_default=True,
+        entity_registry_enabled_default=False,
     ),
 ]
 
diff --git a/tests/components/zwave_js/test_init.py b/tests/components/zwave_js/test_init.py
index 324a0f14941..930f27e73f0 100644
--- a/tests/components/zwave_js/test_init.py
+++ b/tests/components/zwave_js/test_init.py
@@ -514,8 +514,8 @@ async def test_on_node_added_not_ready(
     assert len(device.identifiers) == 1
 
     entities = er.async_entries_for_device(entity_registry, device.id)
-    # the only entities are the node status sensor, last_seen sensor, and ping button
-    assert len(entities) == 3
+    # the only entities are the node status sensor, and ping button
+    assert len(entities) == 2
 
 
 async def test_existing_node_ready(
@@ -631,8 +631,8 @@ async def test_existing_node_not_ready(
     assert len(device.identifiers) == 1
 
     entities = er.async_entries_for_device(entity_registry, device.id)
-    # the only entities are the node status sensor, last_seen sensor, and ping button
-    assert len(entities) == 3
+    # the only entities are the node status sensor, and ping button
+    assert len(entities) == 2
 
 
 async def test_existing_node_not_replaced_when_not_ready(
diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py
index 42e2108be89..c7b41449d43 100644
--- a/tests/components/zwave_js/test_sensor.py
+++ b/tests/components/zwave_js/test_sensor.py
@@ -869,7 +869,7 @@ async def test_statistics_sensors_migration(
             )
 
 
-async def test_statistics_sensors_no_last_seen(
+async def test_statistics_sensors(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
     zp3111,
@@ -877,7 +877,7 @@ async def test_statistics_sensors_no_last_seen(
     integration,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test all statistics sensors but last seen which is enabled by default."""
+    """Test statistics sensors."""
 
     for prefix, suffixes in (
         (CONTROLLER_STATISTICS_ENTITY_PREFIX, CONTROLLER_STATISTICS_SUFFIXES),
@@ -1029,7 +1029,16 @@ async def test_last_seen_statistics_sensors(
     entity_id = f"{NODE_STATISTICS_ENTITY_PREFIX}last_seen"
     entry = entity_registry.async_get(entity_id)
     assert entry
-    assert not entry.disabled
+    assert entry.disabled
+    assert entry.disabled_by is er.RegistryEntryDisabler.INTEGRATION
+    assert hass.states.get(entity_id) is None  # disabled by default
+
+    entity_registry.async_update_entity(entity_id, disabled_by=None)
+    async_fire_time_changed(
+        hass,
+        dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+    )
+    await hass.async_block_till_done()
 
     state = hass.states.get(entity_id)
     assert state