diff --git a/homeassistant/core.py b/homeassistant/core.py index f8540ae7e70..f94a7d4c1bb 100644 --- a/homeassistant/core.py +++ b/homeassistant/core.py @@ -1680,11 +1680,15 @@ class State: @cached_property def last_changed_timestamp(self) -> float: """Timestamp of last change.""" + if self.last_changed == self.last_updated: + return self.last_updated_timestamp return self.last_changed.timestamp() @cached_property def last_reported_timestamp(self) -> float: """Timestamp of last report.""" + if self.last_reported == self.last_updated: + return self.last_updated_timestamp return self.last_reported.timestamp() @cached_property