diff --git a/esphome/config.py b/esphome/config.py
index 842bb5aab6..debd261b41 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -450,10 +450,10 @@ def validate_config(config):
         result.remove_output_path([domain], domain)
 
         # Ensure conf is a list
-        if not isinstance(conf, list) and conf:
-            result[domain] = conf = [conf]
-        elif not conf:
+        if not conf:
             result[domain] = conf = []
+        elif not isinstance(conf, list):
+            result[domain] = conf = [conf]
 
         for i, p_config in enumerate(conf):
             path = [domain, i]