diff --git a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java
index 62415bb..3a20a1e 100644
--- a/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java
+++ b/spring-cloud-app-broker-autoconfigure/src/main/java/org/springframework/cloud/appbroker/autoconfigure/AppBrokerAutoConfiguration.java
@@ -18,6 +18,9 @@ package org.springframework.cloud.appbroker.autoconfigure;
 
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -81,6 +84,8 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnBean(AppDeployer.class)
 public class AppBrokerAutoConfiguration {
 
+	private static final Logger LOG = LoggerFactory.getLogger(AppBrokerAutoConfiguration.class);
+
 	private static final String PROPERTY_PREFIX = "spring.cloud.appbroker";
 
 	/**
@@ -152,6 +157,10 @@ public class AppBrokerAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(ServiceInstanceStateRepository.class)
 	public ServiceInstanceStateRepository serviceInstanceStateRepository() {
+		if (LOG.isWarnEnabled()) {
+			LOG.warn("The InMemoryServiceInstanceStateRepository is provided for demonstration and testing purposes " +
+					"only. It is not suitable for production applications!");
+		}
 		return new InMemoryServiceInstanceStateRepository();
 	}
 
@@ -163,6 +172,10 @@ public class AppBrokerAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(ServiceInstanceBindingStateRepository.class)
 	public ServiceInstanceBindingStateRepository serviceInstanceBindingStateRepository() {
+		if (LOG.isWarnEnabled()) {
+			LOG.warn("The InMemoryServiceInstanceBindingStateRepository is provided for demonstration and testing " +
+					"purposes only. It is not suitable for production applications!");
+		}
 		return new InMemoryServiceInstanceBindingStateRepository();
 	}