diff --git a/homeassistant/components/recorder/core.py b/homeassistant/components/recorder/core.py index 01fda0f02faa8c6fbfa0fc8dfd10fc956232b4d8..28291de3be8fc72ddb679b2dffebac94dc5c0349 100644 --- a/homeassistant/components/recorder/core.py +++ b/homeassistant/components/recorder/core.py @@ -319,9 +319,8 @@ class Recorder(threading.Thread): if event.event_type in exclude_event_types: return - if ( - entity_filter is None - or (entity_id := event.data.get(ATTR_ENTITY_ID)) is None + if entity_filter is None or not ( + entity_id := event.data.get(ATTR_ENTITY_ID) ): queue_put(event) return diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py index adfc451c7429f9b8b1d5877f44ffe0cf37208025..8e28e15fdf7706fea72b7e930c9b04b81e2f2166 100644 --- a/tests/components/recorder/test_init.py +++ b/tests/components/recorder/test_init.py @@ -2700,3 +2700,20 @@ async def test_all_tables_use_default_table_args(hass: HomeAssistant) -> None: """Test that all tables use the default table args.""" for table in db_schema.Base.metadata.tables.values(): assert table.kwargs.items() >= db_schema._DEFAULT_TABLE_ARGS.items() + + +async def test_empty_entity_id( + hass: HomeAssistant, + async_setup_recorder_instance: RecorderInstanceGenerator, + caplog: pytest.LogCaptureFixture, +) -> None: + """Test the recorder can handle an empty entity_id.""" + await async_setup_recorder_instance( + hass, + { + "exclude": {"domains": "hidden_domain"}, + }, + ) + hass.bus.async_fire("hello", {"entity_id": ""}) + await async_wait_recording_done(hass) + assert "Invalid entity ID" not in caplog.text