diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
index c851f38d..430bedab 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializer.java
@@ -17,6 +17,7 @@
 package org.springframework.cloud.bootstrap.encrypt;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -187,8 +188,11 @@ public class EnvironmentDecryptApplicationInitializer implements
 
 		if (source instanceof CompositePropertySource) {
 
-			for (PropertySource<?> nested : ((CompositePropertySource) source)
-					.getPropertySources()) {
+			List<PropertySource<?>> sources = new ArrayList<>(
+					((CompositePropertySource) source).getPropertySources());
+			Collections.reverse(sources);
+
+			for (PropertySource<?> nested : sources) {
 				decrypt(nested, overrides);
 			}
 
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
index 8e1decee..07137f9c 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EnvironmentDecryptApplicationInitializerTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.bootstrap.encrypt;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
@@ -35,7 +36,7 @@ import org.springframework.security.crypto.encrypt.Encryptors;
 import org.springframework.security.crypto.encrypt.TextEncryptor;
 
 import static org.assertj.core.api.BDDAssertions.then;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.springframework.cloud.bootstrap.encrypt.EnvironmentDecryptApplicationInitializer.DECRYPTED_PROPERTY_SOURCE_NAME;
@@ -154,23 +155,28 @@ public class EnvironmentDecryptApplicationInitializerTests {
 
 	@Test
 	public void testDecryptCompositePropertySource() {
-		String expected = "always";
 		TextEncryptor textEncryptor = mock(TextEncryptor.class);
-		when(textEncryptor.decrypt(anyString())).thenReturn(expected);
+		when(textEncryptor.decrypt(eq("value1"))).thenReturn("always1");
+		when(textEncryptor.decrypt(eq("value2"))).thenReturn("always2");
 
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext();
 		EnvironmentDecryptApplicationInitializer initializer = new EnvironmentDecryptApplicationInitializer(
 				textEncryptor);
 
-		MapPropertySource source = new MapPropertySource("nobody",
-				Collections.singletonMap("key", "{cipher}value"));
+		MapPropertySource devProfile = new MapPropertySource("dev-profile",
+				Collections.singletonMap("key", "{cipher}value1"));
+
+		MapPropertySource defaultProfile = new MapPropertySource("default-profile",
+				Collections.singletonMap("key", "{cipher}value2"));
+
 		CompositePropertySource cps = mock(CompositePropertySource.class);
-		when(cps.getPropertyNames()).thenReturn(source.getPropertyNames());
-		when(cps.getPropertySources()).thenReturn(Collections.singleton(source));
+		when(cps.getPropertyNames()).thenReturn(devProfile.getPropertyNames());
+		when(cps.getPropertySources())
+				.thenReturn(Arrays.asList(devProfile, defaultProfile));
 		ctx.getEnvironment().getPropertySources().addLast(cps);
 
 		initializer.initialize(ctx);
-		then(ctx.getEnvironment().getProperty("key")).isEqualTo(expected);
+		then(ctx.getEnvironment().getProperty("key")).isEqualTo("always1");
 	}
 
 }