diff --git a/homeassistant/components/device_tracker/linksys_smart.py b/homeassistant/components/device_tracker/linksys_smart.py index 2d7fbfea33c..e71502ba5ee 100644 --- a/homeassistant/components/device_tracker/linksys_smart.py +++ b/homeassistant/components/device_tracker/linksys_smart.py @@ -83,11 +83,14 @@ class LinksysSmartWifiDeviceScanner(DeviceScanner): if not connections: _LOGGER.debug("Device %s is not connected", mac) continue - name = device["friendlyName"] - properties = device["properties"] - for prop in properties: + + name = None + for prop in device["properties"]: if prop["name"] == "userDeviceName": name = prop["value"] + if not name: + name = device.get("friendlyName", device["deviceID"]) + _LOGGER.debug("Device %s is connected", mac) self.last_results[mac] = name except (KeyError, IndexError):