diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py
index a5930e658fb..ea0e3078b0c 100644
--- a/homeassistant/components/canary/alarm_control_panel.py
+++ b/homeassistant/components/canary/alarm_control_panel.py
@@ -24,10 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Canary alarms."""
     data = hass.data[DATA_CANARY]
-    devices = []
-
-    for location in data.locations:
-        devices.append(CanaryAlarm(data, location.location_id))
+    devices = [CanaryAlarm(data, location.location_id) for location in data.locations]
 
     add_entities(devices, True)
 
diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py
index 870256ffcff..3ba7f094da1 100644
--- a/homeassistant/components/canary/camera.py
+++ b/homeassistant/components/canary/camera.py
@@ -29,6 +29,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Canary sensors."""
+    if discovery_info is not None:
+        return
+
     data = hass.data[DATA_CANARY]
     devices = []