diff --git a/homeassistant/components/sensor/template.py b/homeassistant/components/sensor/template.py
index 0462d664e26..75cbfa97c7d 100644
--- a/homeassistant/components/sensor/template.py
+++ b/homeassistant/components/sensor/template.py
@@ -24,7 +24,7 @@ SENSOR_SCHEMA = vol.Schema({
     vol.Required(CONF_VALUE_TEMPLATE): cv.template,
     vol.Optional(ATTR_FRIENDLY_NAME): cv.string,
     vol.Optional(ATTR_UNIT_OF_MEASUREMENT): cv.string,
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids
+    vol.Optional(ATTR_ENTITY_ID, default=MATCH_ALL): cv.entity_ids
 })
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -38,11 +38,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     sensors = []
 
     for device, device_config in config[CONF_SENSORS].items():
+        state_template = device_config[CONF_VALUE_TEMPLATE]
+        entity_ids = device_config[ATTR_ENTITY_ID, MATCH_ALL]
         friendly_name = device_config.get(ATTR_FRIENDLY_NAME, device)
         unit_of_measurement = device_config.get(ATTR_UNIT_OF_MEASUREMENT)
-        state_template = device_config.get(CONF_VALUE_TEMPLATE)
-
-        entity_ids = device_config.get(ATTR_ENTITY_ID, MATCH_ALL)
 
         sensors.append(
             SensorTemplate(