diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index cea7e95ac5a..031ab5227dc 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -369,6 +369,8 @@ CONDITION_SCHEMA = vol.Any(
     TEMPLATE_CONDITION_SCHEMA,
     TIME_CONDITION_SCHEMA,
     ZONE_CONDITION_SCHEMA,
+    AND_CONDITION_SCHEMA,
+    OR_CONDITION_SCHEMA,
 )
 
 _SCRIPT_DELAY_SCHEMA = vol.Schema({