diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index ab6c3a084c0..472a88888d8 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -216,6 +216,10 @@ class EntityPlatform(object):
                                    component_entities, registry)
             for entity in new_entities]
 
+        # No entities for processing
+        if not tasks:
+            return
+
         await asyncio.wait(tasks, loop=self.hass.loop)
         self.async_entities_added_callback()
 
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index 9fa178022dc..2d2f148189f 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -592,3 +592,13 @@ async def test_reset_cancels_retry_setup(hass):
 
     assert len(mock_call_later.return_value.mock_calls) == 1
     assert ent_platform._async_cancel_retry_setup is None
+
+
+@asyncio.coroutine
+def test_not_fails_with_adding_empty_entities_(hass):
+    """Test for not fails on empty entities list."""
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+
+    yield from component.async_add_entities([])
+
+    assert len(hass.states.async_entity_ids()) == 0