diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
index 98e901fc05f..2cc0feb1c68 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements
 	private String[] searchLocations = new String[] { "classpath:", "file:./",
 			"classpath:config/", "file:./config/" };
 
-	private String names = "${spring.config.name},application";
+	private String names = "${spring.config.name:application}";
 
 	private int order = Integer.MIN_VALUE + 10;