diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLocationResolver.java
index 70f7ebc8..0544213c 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLocationResolver.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/AbstractConfigDataLocationResolver.java
@@ -96,7 +96,12 @@ public abstract class AbstractConfigDataLocationResolver<L extends AbstractConfi
 
 	public boolean isResolvable(ConfigDataLocationResolverContext context,
 			String location) {
-		return location.startsWith(getPrefix());
+		if (!location.startsWith(getPrefix())) {
+			return false;
+		}
+		return context.getBinder()
+				.bind(ConfigClientProperties.PREFIX + ".enabled", Boolean.class)
+				.orElse(true);
 	}
 
 	protected String getPrefix() {
diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
index 14f6cc0d..0cd2108a 100644
--- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
+++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServiceBootstrapConfiguration.java
@@ -53,7 +53,8 @@ public class ConfigServiceBootstrapConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(ConfigServicePropertySourceLocator.class)
-	@ConditionalOnProperty(value = "spring.cloud.config.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = ConfigClientProperties.PREFIX + ".enabled",
+			matchIfMissing = true)
 	public ConfigServicePropertySourceLocator configServicePropertySource(
 			ConfigClientProperties properties) {
 		ConfigServicePropertySourceLocator locator = new ConfigServicePropertySourceLocator(
@@ -61,7 +62,7 @@ public class ConfigServiceBootstrapConfiguration {
 		return locator;
 	}
 
-	@ConditionalOnProperty("spring.cloud.config.fail-fast")
+	@ConditionalOnProperty(ConfigClientProperties.PREFIX + ".fail-fast")
 	@ConditionalOnClass({ Retryable.class, Aspect.class, AopAutoConfiguration.class })
 	@Configuration(proxyBeanMethods = false)
 	@EnableRetry(proxyTargetClass = true)
diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java
index 4ff3eab8..0526791f 100644
--- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java
+++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java
@@ -26,6 +26,7 @@ import org.springframework.mock.env.MockEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class ConfigServerConfigDataLocationResolverTests {
 
@@ -43,6 +44,7 @@ public class ConfigServerConfigDataLocationResolverTests {
 		this.environment = new MockEnvironment();
 		this.environmentBinder = Binder.get(this.environment);
 		this.resolver = new ConfigServerConfigDataLocationResolver(new DeferredLog());
+		when(context.getBinder()).thenReturn(environmentBinder);
 	}
 
 	@Test
@@ -55,4 +57,10 @@ public class ConfigServerConfigDataLocationResolverTests {
 		assertThat(this.resolver.isResolvable(this.context, "configserver:")).isTrue();
 	}
 
+	@Test
+	void isResolvableReturnsFalseWhenDisabled() {
+		this.environment.setProperty(ConfigClientProperties.PREFIX + ".enabled", "false");
+		assertThat(this.resolver.isResolvable(this.context, "configserver:")).isFalse();
+	}
+
 }