diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index ee127976fae..dacb4a3bcf7 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -79,7 +79,8 @@ def from_config_dict(config, hass=None):
 
     # Make a copy because we are mutating it.
     # Convert it to defaultdict so components can always have config dict
-    config = defaultdict(dict, config)
+    # Convert values to dictionaries if they are None
+    config = defaultdict(dict, {key: value or {} for key, value in config.items()})
 
     # Filter out the repeating and common config section [homeassistant]
     components = (key for key in config.keys()