diff --git a/homeassistant/components/lutron/__init__.py b/homeassistant/components/lutron/__init__.py index de8ff228bc4..c0f378d19d7 100644 --- a/homeassistant/components/lutron/__init__.py +++ b/homeassistant/components/lutron/__init__.py @@ -131,6 +131,9 @@ class LutronDevice(Entity): @property def unique_id(self): """Return a unique ID.""" + # Temporary fix for https://github.com/thecynic/pylutron/issues/70 + if self._lutron_device.uuid is None: + return None return f"{self._controller.guid}_{self._lutron_device.uuid}"