diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 1edf52cbb7fee92fad4591edd03b873702f437bd..56d64cd8fd94beacf6983de009695983814e9b6c 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -156,7 +156,7 @@ def entity_id(value: Any) -> str:
     value = string(value).lower()
     if valid_entity_id(value):
         return value
-    elif re.match(OLD_ENTITY_ID_VALIDATION, value):
+    if re.match(OLD_ENTITY_ID_VALIDATION, value):
         # To ease the breaking change, we allow old slugs for now
         # Remove after 0.94 or 1.0
         fixed = '.'.join(util_slugify(part) for part in value.split('.', 1))