diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py
index fbf8ab77230..ee6f9b1bd5d 100644
--- a/homeassistant/components/scene/__init__.py
+++ b/homeassistant/components/scene/__init__.py
@@ -48,7 +48,7 @@ def setup(hass, config):
             platform_config = [platform_config]
 
         if not any(CONF_PLATFORM in entry for entry in platform_config):
-            platform_config = [{'platform': 'homeassistant', 'config': entry}
+            platform_config = [{'platform': 'homeassistant', 'states': entry}
                                for entry in platform_config]
 
         config[config_key] = platform_config
diff --git a/homeassistant/components/scene/homeassistant.py b/homeassistant/components/scene/homeassistant.py
index bb6f3a263e7..0d6c2191133 100644
--- a/homeassistant/components/scene/homeassistant.py
+++ b/homeassistant/components/scene/homeassistant.py
@@ -25,9 +25,13 @@ SceneConfig = namedtuple('SceneConfig', ['name', 'states'])
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """ Sets up home assistant scene entries. """
-    scene_config = config.get("config")
+    scene_config = config.get("states")
 
-    add_devices([HomeAssistantScene(hass, _process_config(scene_config))])
+    if not isinstance(scene_config, list):
+        scene_config = [scene_config]
+
+    add_devices(HomeAssistantScene(hass, _process_config(scene))
+                for scene in scene_config)
 
     return True