diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
index e560cd971a..fcbc485b70 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java
@@ -96,7 +96,9 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
  */
 @Configuration
 @ConditionalOnClass({ EnableWebSecurity.class })
-@ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
+// TODO: re-enable this when SPR-11069 is fixed
+// @ConditionalOnMissingBean(annotation = EnableWebSecurity.class)
+@ConditionalOnMissingBean(SecurityAutoConfiguration.class)
 @EnableConfigurationProperties
 public class SecurityAutoConfiguration {
 
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
index 17ac0c4cc7..4b4f8b3bff 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java
@@ -29,5 +29,4 @@ public class SampleDataJpaApplication {
 	public static void main(String[] args) throws Exception {
 		SpringApplication.run(SampleDataJpaApplication.class, args);
 	}
-
 }