diff --git a/homeassistant/util/yaml.py b/homeassistant/util/yaml.py
index 15bf73f459d..f6d967b6e5a 100644
--- a/homeassistant/util/yaml.py
+++ b/homeassistant/util/yaml.py
@@ -157,6 +157,8 @@ def _include_dir_named_yaml(loader: SafeLineLoader,
     loc = os.path.join(os.path.dirname(loader.name), node.value)
     for fname in _find_files(loc, '*.yaml'):
         filename = os.path.splitext(os.path.basename(fname))[0]
+        if os.path.basename(fname) == SECRET_YAML:
+            continue
         mapping[filename] = load_yaml(fname)
     return _add_reference(mapping, loader, node)
 
diff --git a/tests/util/test_yaml.py b/tests/util/test_yaml.py
index 46dc3c045b2..99eee30027c 100644
--- a/tests/util/test_yaml.py
+++ b/tests/util/test_yaml.py
@@ -134,7 +134,7 @@ class TestYaml(unittest.TestCase):
     def test_include_dir_named(self, mock_walk):
         """Test include dir named yaml."""
         mock_walk.return_value = [
-            ['/tmp', [], ['first.yaml', 'second.yaml']]
+            ['/tmp', [], ['first.yaml', 'second.yaml', 'secrets.yaml']]
         ]
 
         with patch_yaml_files({