diff --git a/homeassistant/components/template/cover.py b/homeassistant/components/template/cover.py
index f6678067d70..13828b960fd 100644
--- a/homeassistant/components/template/cover.py
+++ b/homeassistant/components/template/cover.py
@@ -134,7 +134,9 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
         }
 
         initialise_templates(hass, templates)
-        entity_ids = extract_entities(device, "cover", None, templates)
+        entity_ids = extract_entities(
+            device, "cover", device_config.get(CONF_ENTITY_ID), templates
+        )
 
         covers.append(
             CoverTemplate(
diff --git a/homeassistant/components/template/light.py b/homeassistant/components/template/light.py
index 2fb240e1180..0f70f8a358b 100644
--- a/homeassistant/components/template/light.py
+++ b/homeassistant/components/template/light.py
@@ -94,7 +94,9 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
         }
 
         initialise_templates(hass, templates)
-        entity_ids = extract_entities(device, "light", None, templates)
+        entity_ids = extract_entities(
+            device, "light", device_config.get(CONF_ENTITY_ID), templates
+        )
 
         lights.append(
             LightTemplate(