diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractVaultEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractVaultEnvironmentRepository.java
index 3f4e4a30..5fb70bb8 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractVaultEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AbstractVaultEnvironmentRepository.java
@@ -25,6 +25,9 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotEmpty;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.cloud.config.environment.Environment;
@@ -44,6 +47,8 @@ import static org.springframework.cloud.config.client.ConfigClientProperties.STA
  */
 public abstract class AbstractVaultEnvironmentRepository implements EnvironmentRepository, Ordered {
 
+	private static Log log = LogFactory.getLog(AbstractVaultEnvironmentRepository.class);
+
 	// TODO: move to watchState:String on findOne?
 	protected final ObjectProvider<HttpServletRequest> request;
 
@@ -104,8 +109,14 @@ public abstract class AbstractVaultEnvironmentRepository implements EnvironmentR
 	private String getWatchState() {
 		HttpServletRequest servletRequest = this.request.getIfAvailable();
 		if (servletRequest != null) {
-			String state = servletRequest.getHeader(STATE_HEADER);
-			return this.watch.watch(state);
+			try {
+				String state = servletRequest.getHeader(STATE_HEADER);
+				return this.watch.watch(state);
+			}
+			catch (IllegalStateException e) {
+				log.debug("Could not get state.", e);
+				return null;
+			}
 		}
 		return null;
 	}