diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index e31a4bb66c7..a87deaa76d5 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -208,7 +208,7 @@ def process_ha_core_config(hass, config):
         if key in config:
             setattr(hass.config, attr, config[key])
 
-    Entity.visibility.update(config.get('visibility', [{}])[0])
+    Entity.visibility.update(config.get('visibility', {}))
 
     if CONF_TEMPERATURE_UNIT in config:
         unit = config[CONF_TEMPERATURE_UNIT]