diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentEncryptorEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentEncryptorEnvironmentRepository.java
index f9d30f07..6af680f9 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentEncryptorEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentEncryptorEnvironmentRepository.java
@@ -66,8 +66,11 @@ public class EnvironmentEncryptorEnvironmentRepository implements EnvironmentRep
 	public void setOverrides(Map<String, String> overrides) {
 		this.overrides = new HashMap<String, String>(overrides);
 		for (String key : overrides.keySet()) {
-			if (overrides.get(key).contains("$\\{")) {
-				this.overrides.put(key, overrides.get(key).replace("$\\{", "${"));
+			if (overrides.get(key).contains("\\{")) {
+				this.overrides.put(key, overrides.get(key).replace("\\{", "{"));
+			}
+			if (overrides.get(key).contains("\\${")) {
+				this.overrides.put(key, overrides.get(key).replace("\\${", "${"));
 			}
 		}
 	}