diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py index 1b006f69827..1deebf6b531 100644 --- a/homeassistant/components/mobile_app/device_tracker.py +++ b/homeassistant/components/mobile_app/device_tracker.py @@ -94,7 +94,9 @@ class MobileAppEntity(TrackerEntity, RestoreEntity): @property def location_name(self): """Return a location name for the current location of the device.""" - return self._data.get(ATTR_LOCATION_NAME) + if location_name := self._data.get(ATTR_LOCATION_NAME): + return location_name + return None @property def name(self): diff --git a/tests/components/mobile_app/test_device_tracker.py b/tests/components/mobile_app/test_device_tracker.py index 164b90a5290..b755a0a8d09 100644 --- a/tests/components/mobile_app/test_device_tracker.py +++ b/tests/components/mobile_app/test_device_tracker.py @@ -48,6 +48,7 @@ async def test_sending_location(hass, create_registrations, webhook_client): "course": 6, "speed": 7, "vertical_accuracy": 8, + "location_name": "", }, }, ) @@ -82,7 +83,6 @@ async def test_restoring_location(hass, create_registrations, webhook_client): "course": 60, "speed": 70, "vertical_accuracy": 80, - "location_name": "bar", }, }, ) @@ -104,6 +104,7 @@ async def test_restoring_location(hass, create_registrations, webhook_client): assert state_1 is not state_2 assert state_2.name == "Test 1" + assert state_2.state == "not_home" assert state_2.attributes["source_type"] == "gps" assert state_2.attributes["latitude"] == 10 assert state_2.attributes["longitude"] == 20