diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index 4154ca337a3..65a4d50be84 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -14,6 +14,7 @@ from homeassistant.util.yaml import load_yaml, dump
 DOMAIN = 'config'
 DEPENDENCIES = ['http']
 SECTIONS = (
+    'area_registry',
     'auth',
     'auth_provider_homeassistant',
     'automation',
diff --git a/homeassistant/components/config/device_registry.py b/homeassistant/components/config/device_registry.py
index d81bdeb1f06..0677531242a 100644
--- a/homeassistant/components/config/device_registry.py
+++ b/homeassistant/components/config/device_registry.py
@@ -18,7 +18,7 @@ WS_TYPE_UPDATE = 'config/device_registry/update'
 SCHEMA_WS_UPDATE = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend({
     vol.Required('type'): WS_TYPE_UPDATE,
     vol.Required('device_id'): str,
-    vol.Optional('area_id'): str,
+    vol.Optional('area_id'): vol.Any(str, None),
 })