diff --git a/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java b/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
index 76fdaeac8fd..bb2cc3c50bd 100644
--- a/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
+++ b/src/main/java/org/elasticsearch/common/settings/loader/SettingsLoaderFactory.java
@@ -37,7 +37,7 @@ public final class SettingsLoaderFactory {
     public static SettingsLoader loaderFromResource(String resourceName) {
         if (resourceName.endsWith(".json")) {
             return new JsonSettingsLoader();
-        } else if (resourceName.endsWith(".yml")) {
+        } else if (resourceName.endsWith(".yml") || resourceName.endsWith(".yaml")) {
             return new YamlSettingsLoader();
         } else if (resourceName.endsWith(".properties")) {
             return new PropertiesSettingsLoader();