diff --git a/homeassistant/components/alexa/state_report.py b/homeassistant/components/alexa/state_report.py
index b7ff9d17fe8..42c16919a45 100644
--- a/homeassistant/components/alexa/state_report.py
+++ b/homeassistant/components/alexa/state_report.py
@@ -131,6 +131,10 @@ async def async_send_add_or_update_message(hass, config, entity_ids):
 
     for entity_id in entity_ids:
         domain = entity_id.split(".", 1)[0]
+
+        if domain not in ENTITY_ADAPTERS:
+            continue
+
         alexa_entity = ENTITY_ADAPTERS[domain](hass, config, hass.states.get(entity_id))
         endpoints.append(alexa_entity.serialize_discovery())
 
@@ -161,6 +165,10 @@ async def async_send_delete_message(hass, config, entity_ids):
 
     for entity_id in entity_ids:
         domain = entity_id.split(".", 1)[0]
+
+        if domain not in ENTITY_ADAPTERS:
+            continue
+
         alexa_entity = ENTITY_ADAPTERS[domain](hass, config, hass.states.get(entity_id))
         endpoints.append({"endpointId": alexa_entity.alexa_id()})
 
diff --git a/tests/components/alexa/test_state_report.py b/tests/components/alexa/test_state_report.py
index 2b3f9f34adf..c05eed2a89b 100644
--- a/tests/components/alexa/test_state_report.py
+++ b/tests/components/alexa/test_state_report.py
@@ -48,7 +48,7 @@ async def test_send_add_or_update_message(hass, aioclient_mock):
     )
 
     await state_report.async_send_add_or_update_message(
-        hass, DEFAULT_CONFIG, ["binary_sensor.test_contact"]
+        hass, DEFAULT_CONFIG, ["binary_sensor.test_contact", "zwave.bla"]
     )
 
     assert len(aioclient_mock.mock_calls) == 1
@@ -75,7 +75,7 @@ async def test_send_delete_message(hass, aioclient_mock):
     )
 
     await state_report.async_send_delete_message(
-        hass, DEFAULT_CONFIG, ["binary_sensor.test_contact"]
+        hass, DEFAULT_CONFIG, ["binary_sensor.test_contact", "zwave.bla"]
     )
 
     assert len(aioclient_mock.mock_calls) == 1